refactor queueset locks #2

miklezzzz · miklezzzz · commit 1c74525b8d55 · 2025-02-17T13:18:22.000+03:00
Signed-off-by: Mikhail Scherba &lt;mikhail.scherba@flant.com&gt;
diff --git a/pkg/task/queue/queue_set.go b/pkg/task/queue/queue_set.go
@@ -116,6 +116,8 @@ func (tqs *TaskQueueSet) Iterate(doFn func(queue *TaskQueue)) {
 		return
 	}
 
+	tqs.m.RLock()
+	defer tqs.m.RUnlock()
 	if len(tqs.Queues) == 0 {
 		return
 	}
@@ -126,14 +128,11 @@ func (tqs *TaskQueueSet) Iterate(doFn func(queue *TaskQueue)) {
 	}
 	// TODO sort names
 
-	tqs.m.RLock()
 	for _, q := range tqs.Queues {
 		if q.Name != tqs.MainName {
 			doFn(q)
 		}
 	}
-
-	tqs.m.RUnlock()
 }
 
 func (tqs *TaskQueueSet) Remove(name string) {

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ func (tqs TaskQueueSet) Iterate(doFn func(queue TaskQueue)) {`
`116`	`116`	`return`
`117`	`117`	`}`
`118`	`118`
	`119`	`+ tqs.m.RLock()`
	`120`	`+ defer tqs.m.RUnlock()`
`119`	`121`	`if len(tqs.Queues) == 0 {`
`120`	`122`	`return`
`121`	`123`	`}`
`@@ -126,14 +128,11 @@ func (tqs TaskQueueSet) Iterate(doFn func(queue TaskQueue)) {`
`126`	`128`	`}`
`127`	`129`	`// TODO sort names`
`128`	`130`
`129`		`- tqs.m.RLock()`
`130`	`131`	`for _, q := range tqs.Queues {`
`131`	`132`	`if q.Name != tqs.MainName {`
`132`	`133`	`doFn(q)`
`133`	`134`	`}`
`134`	`135`	`}`
`135`		`-`
`136`		`- tqs.m.RUnlock()`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`func (tqs *TaskQueueSet) Remove(name string) {`