From 790135bd7d06a8cc5a9d4fc759d06bc1e7a2cad7 Mon Sep 17 00:00:00 2001
From: Cyril Tovena <cyril.tovena@gmail.com>
Date: Wed, 10 Jul 2024 11:52:50 +0200
Subject: [PATCH] feat: RF1 improves replication stategy to support 1 replica
 (#13469)

---
 pkg/ingester-rf1/ring_client.go | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkg/ingester-rf1/ring_client.go b/pkg/ingester-rf1/ring_client.go
index 534a7468fddf..2070ed356fd2 100644
--- a/pkg/ingester-rf1/ring_client.go
+++ b/pkg/ingester-rf1/ring_client.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/kv"
 	"github.com/grafana/dskit/ring"
 	ring_client "github.com/grafana/dskit/ring/client"
 	"github.com/grafana/dskit/services"
@@ -36,7 +37,7 @@ func NewRingClient(
 		logger: log.With(logger, "component", "ingester-rf1-client"),
 		cfg:    cfg,
 	}
-	ringClient.ring, err = ring.New(cfg.LifecyclerConfig.RingConfig, "ingester-rf1", "ingester-rf1-ring", ringClient.logger, registerer)
+	ringClient.ring, err = newRing(cfg.LifecyclerConfig.RingConfig, "ingester-rf1", "ingester-rf1-ring", ringClient.logger, registerer)
 	if err != nil {
 		return nil, err
 	}
@@ -59,6 +60,22 @@ func NewRingClient(
 	return ringClient, nil
 }
 
+func newRing(cfg ring.Config, name, key string, logger log.Logger, reg prometheus.Registerer) (*ring.Ring, error) {
+	codec := ring.GetCodec()
+	// Suffix all client names with "-ring" to denote this kv client is used by the ring
+	store, err := kv.NewClient(
+		cfg.KVStore,
+		codec,
+		kv.RegistererWithKVName(reg, name+"-ring"),
+		logger,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	return ring.NewWithStoreClientAndStrategy(cfg, name, key, store, ring.NewIgnoreUnhealthyInstancesReplicationStrategy(), reg, logger)
+}
+
 func (q *RingClient) starting(ctx context.Context) error {
 	return services.StartManagerAndAwaitHealthy(ctx, q.subservices)
 }