Merge pull request #1130 from lrweck/fix/race_condition_kind_count

rogeralsing · web-flow · commit 3c0e61ca19c9 · 2024-08-22T22:23:45.000+02:00
fix race condition
diff --git a/cluster/gossiper.go b/cluster/gossiper.go
@@ -341,7 +341,7 @@ func (g *Gossiper) GetActorCount() map[string]int64 {
 	clusterKinds := g.cluster.GetClusterKinds()
 	for _, kindName := range clusterKinds {
 		kind := g.cluster.GetClusterKind(kindName)
-		m[kindName] = int64(kind.count)
+		m[kindName] = int64(kind.Count())
 	}
 	g.cluster.Logger().Debug("Actor Count", slog.Any("count", m))
 
diff --git a/cluster/kind.go b/cluster/kind.go
@@ -55,3 +55,7 @@ func (ak *ActivatedKind) Inc() {
 func (ak *ActivatedKind) Dec() {
 	atomic.AddInt32(&ak.count, -1)
 }
+
+func (ak *ActivatedKind) Count() int32 {
+	return atomic.LoadInt32(&ak.count)
+}

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ func (g *Gossiper) GetActorCount() map[string]int64 {`
`341`	`341`	`clusterKinds := g.cluster.GetClusterKinds()`
`342`	`342`	`for _, kindName := range clusterKinds {`
`343`	`343`	`kind := g.cluster.GetClusterKind(kindName)`
`344`		`- m[kindName] = int64(kind.count)`
	`344`	`+ m[kindName] = int64(kind.Count())`
`345`	`345`	`}`
`346`	`346`	`g.cluster.Logger().Debug("Actor Count", slog.Any("count", m))`
`347`	`347`
Original file line number	Diff line number	Diff line change
`@@ -55,3 +55,7 @@ func (ak *ActivatedKind) Inc() {`
`55`	`55`	`func (ak *ActivatedKind) Dec() {`
`56`	`56`	`atomic.AddInt32(&ak.count, -1)`
`57`	`57`	`}`
	`58`	`+`
	`59`	`+func (ak *ActivatedKind) Count() int32 {`
	`60`	`+ return atomic.LoadInt32(&ak.count)`
	`61`	`+}`