pkg/ring: fix data race

rfratto · rfratto · commit 3fea6de97155 · 2020-02-11T09:02:31.000-05:00
Signed-off-by: Robert Fratto &lt;robert.fratto@grafana.com&gt;
diff --git a/pkg/ring/lifecycler.go b/pkg/ring/lifecycler.go
@@ -865,7 +865,7 @@ func (i *Lifecycler) updateConsul(ctx context.Context) error {
 		}
 
 		// Re-sync token states for the current lifecycler if they've changed.
-		ringDesc.SetIngesterTokens(i.ID, i.tokens)
+		ringDesc.SetIngesterTokens(i.ID, i.getTokens())
 		return ringDesc, true, nil
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -865,7 +865,7 @@ func (i *Lifecycler) updateConsul(ctx context.Context) error {`
`865`	`865`	`}`
`866`	`866`
`867`	`867`	`// Re-sync token states for the current lifecycler if they've changed.`
`868`		`- ringDesc.SetIngesterTokens(i.ID, i.tokens)`
	`868`	`+ ringDesc.SetIngesterTokens(i.ID, i.getTokens())`
`869`	`869`	`return ringDesc, true, nil`
`870`	`870`	`})`
`871`	`871`