Fixed integration tests

Signed-off-by: Marco Pracucci <[email protected]>
grafana · Apr 12, 2024 · 56d9a8f · 56d9a8f
1 parent 28e01ba
commit 56d9a8f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/integration/e2emimir/services.go b/integration/e2emimir/services.go
@@ -95,8 +95,10 @@ func NewDistributor(name string, consulAddress string, flags map[string]string,
 			"-ingester.ring.replication-factor": "1",
 			"-distributor.remote-timeout":       "2s", // Fail fast in integration tests.
 			// Configure the ingesters ring backend
-			"-ingester.ring.store":           "consul",
-			"-ingester.ring.consul.hostname": consulAddress,
+			"-ingester.ring.store":                     "consul",
+			"-ingester.ring.consul.hostname":           consulAddress,
+			"-ingester.partition-ring.store":           "consul",
+			"-ingester.partition-ring.consul.hostname": consulAddress,
 			// Configure the distributor ring backend
 			"-distributor.ring.store": "memberlist",
 		},
@@ -113,8 +115,10 @@ func NewQuerier(name string, consulAddress string, flags map[string]string, opti
 			"-log.level":                        "warn",
 			"-ingester.ring.replication-factor": "1",
 			// Ingesters ring backend.
-			"-ingester.ring.store":           "consul",
-			"-ingester.ring.consul.hostname": consulAddress,
+			"-ingester.ring.store":                     "consul",
+			"-ingester.ring.consul.hostname":           consulAddress,
+			"-ingester.partition-ring.store":           "consul",
+			"-ingester.partition-ring.consul.hostname": consulAddress,
 			// Query-frontend worker.
 			"-querier.frontend-client.backoff-min-period": "100ms",
 			"-querier.frontend-client.backoff-max-period": "100ms",
@@ -156,8 +160,10 @@ func NewIngester(name string, consulAddress string, flags map[string]string, opt
 			"-log.level":                "warn",
 			"-ingester.ring.num-tokens": "512",
 			// Configure the ingesters ring backend
-			"-ingester.ring.store":           "consul",
-			"-ingester.ring.consul.hostname": consulAddress,
+			"-ingester.ring.store":                     "consul",
+			"-ingester.ring.consul.hostname":           consulAddress,
+			"-ingester.partition-ring.store":           "consul",
+			"-ingester.partition-ring.consul.hostname": consulAddress,
 			// Speed up the startup.
 			"-ingester.ring.min-ready-duration": "0s",
 			// Enable native histograms
@@ -317,8 +323,10 @@ func NewRuler(name string, consulAddress string, flags map[string]string, option
 			"-target":    "ruler",
 			"-log.level": "warn",
 			// Configure the ingesters ring backend
-			"-ingester.ring.store":           "consul",
-			"-ingester.ring.consul.hostname": consulAddress,
+			"-ingester.ring.store":                     "consul",
+			"-ingester.ring.consul.hostname":           consulAddress,
+			"-ingester.partition-ring.store":           "consul",
+			"-ingester.partition-ring.consul.hostname": consulAddress,
 		},
 		flags,
 		options...,

diff --git a/integration/integration_memberlist_single_binary_test.go b/integration/integration_memberlist_single_binary_test.go
@@ -126,6 +126,7 @@ func newSingleBinary(name string, servername string, join string, testFlags map[
 		"-ingester.ring.min-ready-duration":  "0s",
 		"-ingester.ring.num-tokens":          "512",
 		"-ingester.ring.store":               "memberlist",
+		"-ingester.partition-ring.store":     "memberlist",
 		"-memberlist.bind-port":              "8000",
 		"-memberlist.left-ingesters-timeout": "600s", // effectively disable
 	}

diff --git a/integration/querier_test.go b/integration/querier_test.go
@@ -364,8 +364,10 @@ func TestQuerierWithBlocksStorageRunningInSingleBinaryMode(t *testing.T) {
 				"-blocks-storage.bucket-store.index-cache.memcached.addresses": "dns+" + memcached.NetworkEndpoint(e2ecache.MemcachedPort),
 
 				// Ingester.
-				"-ingester.ring.store":           "consul",
-				"-ingester.ring.consul.hostname": consul.NetworkHTTPEndpoint(),
+				"-ingester.ring.store":                     "consul",
+				"-ingester.ring.consul.hostname":           consul.NetworkHTTPEndpoint(),
+				"-ingester.partition-ring.store":           "consul",
+				"-ingester.partition-ring.consul.hostname": consul.NetworkHTTPEndpoint(),
 				// Distributor.
 				"-ingester.ring.replication-factor": strconv.FormatInt(seriesReplicationFactor, 10),
 				"-distributor.ring.store":           "consul",

diff --git a/integration/single_binary_test.go b/integration/single_binary_test.go
@@ -41,8 +41,10 @@ func TestMimirShouldStartInSingleBinaryModeWithAllMemcachedConfigured(t *testing
 		"-blocks-storage.bucket-store.chunks-cache.backend":               "memcached",
 		"-blocks-storage.bucket-store.chunks-cache.memcached.addresses":   "dns+" + memcached.NetworkEndpoint(e2ecache.MemcachedPort),
 		// Ingester.
-		"-ingester.ring.store":           "consul",
-		"-ingester.ring.consul.hostname": consul.NetworkHTTPEndpoint(),
+		"-ingester.ring.store":                     "consul",
+		"-ingester.ring.consul.hostname":           consul.NetworkHTTPEndpoint(),
+		"-ingester.partition-ring.store":           "consul",
+		"-ingester.partition-ring.consul.hostname": consul.NetworkHTTPEndpoint(),
 		// Distributor.
 		"-ingester.ring.replication-factor": "2",
 		"-distributor.ring.store":           "consul",