Merge pull request grafana/phlare#386 from grafana/race-phone

Fixes a race in the usage reporter
simonswine · Nov 1, 2022 · fba56aa · fba56aa
2 parents 8d08da4 + 52adda6
commit fba56aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/usagestats/reporter.go b/pkg/usagestats/reporter.go
@@ -104,7 +104,8 @@ func (rep *Reporter) initLeader(ctx context.Context) ClusterSeed {
 					return nil, false, nil
 				}
 			}
-			return &seed, true, nil
+
+			return seed.Clone(), true, nil
 		}); err != nil {
 			level.Info(rep.logger).Log("msg", "failed to CAS cluster seed key", "err", err)
 			continue

diff --git a/pkg/usagestats/seed_test.go b/pkg/usagestats/seed_test.go
@@ -59,7 +59,7 @@ func createMemberlist(t *testing.T, port, memberID int) *memberlist.KV {
 }
 
 func Test_Memberlist(t *testing.T) {
-	stabilityCheckInterval = time.Second
+	stabilityCheckInterval = 100 * time.Millisecond
 
 	objectClient, err := client.NewBucket(context.Background(), client.Config{
 		StorageBackendConfig: client.StorageBackendConfig{