Merge pull request kubernetes#88286 from zxl381/CICS_kubemark

k8s-ci-robot · web-flow · commit ad2dd71f713e · 2020-02-24T19:07:01.000-08:00
kubemark: move a channel send out of critical section
diff --git a/pkg/kubemark/controller.go b/pkg/kubemark/controller.go
@@ -195,11 +195,11 @@ func (kubemarkController *KubemarkController) SetNodeGroupSize(nodeGroup string,
 		}
 	case delta > 0:
 		kubemarkController.nodeGroupQueueSizeLock.Lock()
+		kubemarkController.nodeGroupQueueSize[nodeGroup] += delta
+		kubemarkController.nodeGroupQueueSizeLock.Unlock()
 		for i := 0; i < delta; i++ {
-			kubemarkController.nodeGroupQueueSize[nodeGroup]++
 			kubemarkController.createNodeQueue <- nodeGroup
 		}
-		kubemarkController.nodeGroupQueueSizeLock.Unlock()
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -195,11 +195,11 @@ func (kubemarkController *KubemarkController) SetNodeGroupSize(nodeGroup string,`
`195`	`195`	`}`
`196`	`196`	`case delta > 0:`
`197`	`197`	`kubemarkController.nodeGroupQueueSizeLock.Lock()`
	`198`	`+ kubemarkController.nodeGroupQueueSize[nodeGroup] += delta`
	`199`	`+ kubemarkController.nodeGroupQueueSizeLock.Unlock()`
`198`	`200`	`for i := 0; i < delta; i++ {`
`199`		`- kubemarkController.nodeGroupQueueSize[nodeGroup]++`
`200`	`201`	`kubemarkController.createNodeQueue <- nodeGroup`
`201`	`202`	`}`
`202`		`- kubemarkController.nodeGroupQueueSizeLock.Unlock()`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`return nil`