ring: Fix tests

Signed-off-by: Arve Knudsen <[email protected]>
grafana · Feb 10, 2022 · 5999790 · 5999790
1 parent 856020c
commit 5999790
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/ring/lifecycler_test.go b/ring/lifecycler_test.go
@@ -265,7 +265,7 @@ func TestLifecycler_IncreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 	var ringConfig Config
 	flagext.DefaultValues(&ringConfig)
 	ringConfig.KVStore.Mock = ringStore
-	r, err := New(ringConfig, "ingester", IngesterRingKey, log.NewNopLogger(), nil)
+	r, err := New(ringConfig, "ingester", ringKey, log.NewNopLogger(), nil)
 	require.NoError(t, err)
 	require.NoError(t, services.StartAndAwaitRunning(ctx, r))
 	t.Cleanup(func() {
@@ -280,7 +280,7 @@ func TestLifecycler_IncreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 	lifecyclerConfig.TokensFilePath = filepath.Join(tokenDir, "/tokens")
 
 	// Simulate ingester with 64 tokens left the ring in LEAVING state
-	err = r.KVClient.CAS(ctx, IngesterRingKey, func(in interface{}) (out interface{}, retry bool, err error) {
+	err = r.KVClient.CAS(ctx, ringKey, func(in interface{}) (out interface{}, retry bool, err error) {
 		ringDesc := NewDesc()
 		addr, err := GetInstanceAddr(lifecyclerConfig.Addr, lifecyclerConfig.InfNames, nil)
 		if err != nil {
@@ -293,7 +293,7 @@ func TestLifecycler_IncreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 	require.NoError(t, err)
 
 	// Start ingester with increased number of tokens
-	l, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester", IngesterRingKey, true, log.NewNopLogger(), nil)
+	l, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester", ringKey, true, log.NewNopLogger(), nil)
 	require.NoError(t, err)
 	require.NoError(t, services.StartAndAwaitRunning(ctx, l))
 	t.Cleanup(func() {
@@ -302,7 +302,7 @@ func TestLifecycler_IncreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 
 	// Verify ingester joined, is active, and has 128 tokens
 	test.Poll(t, time.Second, true, func() interface{} {
-		d, err := r.KVClient.Get(ctx, IngesterRingKey)
+		d, err := r.KVClient.Get(ctx, ringKey)
 		require.NoError(t, err)
 
 		desc, ok := d.(*Desc)
@@ -323,7 +323,7 @@ func TestLifecycler_DecreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 	var ringConfig Config
 	flagext.DefaultValues(&ringConfig)
 	ringConfig.KVStore.Mock = ringStore
-	r, err := New(ringConfig, "ingester", IngesterRingKey, log.NewNopLogger(), nil)
+	r, err := New(ringConfig, "ingester", ringKey, log.NewNopLogger(), nil)
 	require.NoError(t, err)
 	require.NoError(t, services.StartAndAwaitRunning(ctx, r))
 	t.Cleanup(func() {
@@ -338,7 +338,7 @@ func TestLifecycler_DecreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 	lifecyclerConfig.TokensFilePath = filepath.Join(tokenDir, "/tokens")
 
 	// Simulate ingester with 128 tokens left the ring in LEAVING state
-	err = r.KVClient.CAS(ctx, IngesterRingKey, func(in interface{}) (out interface{}, retry bool, err error) {
+	err = r.KVClient.CAS(ctx, ringKey, func(in interface{}) (out interface{}, retry bool, err error) {
 		ringDesc := NewDesc()
 		addr, err := GetInstanceAddr(lifecyclerConfig.Addr, lifecyclerConfig.InfNames, nil)
 		if err != nil {
@@ -351,7 +351,7 @@ func TestLifecycler_DecreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 	require.NoError(t, err)
 
 	// Start ingester with decreased number of tokens
-	l, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester", IngesterRingKey, true, log.NewNopLogger(), nil)
+	l, err := NewLifecycler(lifecyclerConfig, &noopFlushTransferer{}, "ingester", ringKey, true, log.NewNopLogger(), nil)
 	require.NoError(t, err)
 	require.NoError(t, services.StartAndAwaitRunning(ctx, l))
 	t.Cleanup(func() {
@@ -360,7 +360,7 @@ func TestLifecycler_DecreasingTokensLeavingInstanceInTheRing(t *testing.T) {
 
 	// Verify ingester joined, is active, and has 64 tokens
 	test.Poll(t, time.Second, true, func() interface{} {
-		d, err := r.KVClient.Get(ctx, IngesterRingKey)
+		d, err := r.KVClient.Get(ctx, ringKey)
 		require.NoError(t, err)
 
 		desc, ok := d.(*Desc)