Merge pull request #551 from astefanutti/pr-07

openshift-merge-robot · web-flow · commit 55fb5ee30c3e · 2023-08-07T16:48:49.000+02:00
Use receive-only channels for stopping controllers
diff --git a/pkg/controller/queuejob/queuejob_controller_ex.go b/pkg/controller/queuejob/queuejob_controller_ex.go
@@ -1407,7 +1407,7 @@ func (qjm *XController) backoff(ctx context.Context, q *arbv1.AppWrapper, reason
 }
 
 // Run starts AppWrapper Controller
-func (cc *XController) Run(stopCh chan struct{}) {
+func (cc *XController) Run(stopCh <-chan struct{}) {
 	go cc.appwrapperInformer.Informer().Run(stopCh)
 
 	go cc.qjobResControls[arbv1.ResourceTypePod].Run(stopCh)
diff --git a/pkg/controller/queuejobdispatch/queuejobagent.go b/pkg/controller/queuejobdispatch/queuejobagent.go
@@ -153,7 +153,7 @@ func (cc *JobClusterAgent) deleteQueueJob(obj interface{}) {
 	cc.agentEventQueue.Add(qj)
 }
 
-func (qa *JobClusterAgent) Run(stopCh chan struct{}) {
+func (qa *JobClusterAgent) Run(stopCh <-chan struct{}) {
 	go qa.jobInformer.Informer().Run(stopCh)
 	cache.WaitForCacheSync(stopCh, qa.jobSynced)
 }

Original file line number	Diff line number	Diff line change
`@@ -1407,7 +1407,7 @@ func (qjm XController) backoff(ctx context.Context, q arbv1.AppWrapper, reason`
`1407`	`1407`	`}`
`1408`	`1408`
`1409`	`1409`	`// Run starts AppWrapper Controller`
`1410`		`-func (cc *XController) Run(stopCh chan struct{}) {`
	`1410`	`+func (cc *XController) Run(stopCh <-chan struct{}) {`
`1411`	`1411`	`go cc.appwrapperInformer.Informer().Run(stopCh)`
`1412`	`1412`
`1413`	`1413`	`go cc.qjobResControls[arbv1.ResourceTypePod].Run(stopCh)`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func (cc *JobClusterAgent) deleteQueueJob(obj interface{}) {`
`153`	`153`	`cc.agentEventQueue.Add(qj)`
`154`	`154`	`}`
`155`	`155`
`156`		`-func (qa *JobClusterAgent) Run(stopCh chan struct{}) {`
	`156`	`+func (qa *JobClusterAgent) Run(stopCh <-chan struct{}) {`
`157`	`157`	`go qa.jobInformer.Informer().Run(stopCh)`
`158`	`158`	`cache.WaitForCacheSync(stopCh, qa.jobSynced)`
`159`	`159`	`}`