Merge pull request #6197 from cortexproject/CharlieTLe-patch-1

CharlieTLe · web-flow · commit 2490796e0c1f · 2024-09-11T16:12:53.000-07:00
fix: querier integration flaky test
diff --git a/integration/querier_test.go b/integration/querier_test.go
@@ -228,7 +228,7 @@ func TestQuerierWithBlocksStorageRunningInMicroservicesMode(t *testing.T) {
 					// then the metric only appears in one store gateway instance.
 					require.NoError(t, storeGateways.WaitSumMetricsWithOptions(e2e.Equals(2), []string{"cortex_bucket_store_blocks_loaded"}, e2e.SkipMissingMetrics))
 				} else {
-					require.NoError(t, storeGateways.WaitSumMetrics(e2e.Equals(float64(2*storeGateways.NumInstances())), "cortex_bucket_store_blocks_loaded"))
+					require.NoError(t, storeGateways.WaitSumMetricsWithOptions(e2e.Equals(float64(2*storeGateways.NumInstances())), []string{"cortex_bucket_store_blocks_loaded"}, e2e.WaitMissingMetrics))
 				}
 
 				// Check how many tenants have been discovered and synced by store-gateways.

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ func TestQuerierWithBlocksStorageRunningInMicroservicesMode(t *testing.T) {`
`228`	`228`	`// then the metric only appears in one store gateway instance.`
`229`	`229`	`require.NoError(t, storeGateways.WaitSumMetricsWithOptions(e2e.Equals(2), []string{"cortex_bucket_store_blocks_loaded"}, e2e.SkipMissingMetrics))`
`230`	`230`	`} else {`
`231`		`- require.NoError(t, storeGateways.WaitSumMetrics(e2e.Equals(float64(2*storeGateways.NumInstances())), "cortex_bucket_store_blocks_loaded"))`
	`231`	`+ require.NoError(t, storeGateways.WaitSumMetricsWithOptions(e2e.Equals(float64(2*storeGateways.NumInstances())), []string{"cortex_bucket_store_blocks_loaded"}, e2e.WaitMissingMetrics))`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`// Check how many tenants have been discovered and synced by store-gateways.`