refactor(scheduler): replace init methods with constructor functions (#905)

Signed-off-by: yxxhero <[email protected]>

Author: yxxhero

pkg/scheduler/nodes.go

@@ -39,8 +39,10 @@ type nodeManager struct {
 	mutex sync.RWMutex
 }
 
-func (m *nodeManager) init() {
-	m.nodes = make(map[string]*util.NodeInfo)
+func newNodeManager() *nodeManager {
+	return &nodeManager{
+		nodes: make(map[string]*util.NodeInfo),
+	}
 }
 
 func (m *nodeManager) addNode(nodeID string, nodeInfo *util.NodeInfo) {

pkg/scheduler/nodes_test.go

@@ -189,9 +189,7 @@ func Test_GetNode(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			m := nodeManager{}
-			m.init()
-			m = nodeManager{
+			m := nodeManager{
 				nodes: map[string]*util.NodeInfo{
 					"node-04": {
 						ID:   "node-04",

pkg/scheduler/pods.go

@@ -47,9 +47,12 @@ type podManager struct {
 	mutex sync.RWMutex
 }
 
-func (m *podManager) init() {
-	m.pods = make(map[k8stypes.UID]*podInfo)
-	klog.InfoS("Pod manager initialized", "podCount", len(m.pods))
+func newPodManager() *podManager {
+	pm := &podManager{
+		pods: make(map[k8stypes.UID]*podInfo),
+	}
+	klog.InfoS("Pod manager initialized", "podCount", len(pm.pods))
+	return pm
 }
 
 func (m *podManager) addPod(pod *corev1.Pod, nodeID string, devices util.PodDevices) {

pkg/scheduler/scheduler.go

@@ -44,8 +44,8 @@ import (
 )
 
 type Scheduler struct {
-	nodeManager
-	podManager
+	*nodeManager
+	*podManager
 
 	stopCh     chan struct{}
 	kubeClient kubernetes.Interface
@@ -67,8 +67,8 @@ func NewScheduler() *Scheduler {
 		cachedstatus: make(map[string]*NodeUsage),
 		nodeNotify:   make(chan struct{}, 1),
 	}
-	s.nodeManager.init()
-	s.podManager.init()
+	s.nodeManager = newNodeManager()
+	s.podManager = newPodManager()
 	klog.V(2).InfoS("Scheduler initialized successfully")
 	return s
 }

pkg/scheduler/scheduler_test.go

@@ -41,8 +41,7 @@ import (
 )
 
 func Test_getNodesUsage(t *testing.T) {
-	nodeMage := nodeManager{}
-	nodeMage.init()
+	nodeMage := newNodeManager()
 	nodeMage.addNode("node1", &util.NodeInfo{
 		ID: "node1",
 		Devices: []util.DeviceInfo{
@@ -80,8 +79,7 @@ func Test_getNodesUsage(t *testing.T) {
 			},
 		},
 	}
-	podMap := podManager{}
-	podMap.init()
+	podMap := newPodManager()
 	podMap.addPod(&corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			UID:       "1111",