Fix tests

Author: hczhu-db

internal/cortex/frontend/transport/utils/utils.go

@@ -105,7 +105,7 @@ func (f *FailedQueryCache) addCacheEntry(queryExpressionNormalized string, query
 func queryHitCache(queryExpressionNormalized string, queryExpressionRangeLength int, lruCache *lru.Cache, cachedHits prometheus.Counter) (bool, string) {
 	if value, ok := lruCache.Get(queryExpressionNormalized); ok && value.(int) <= queryExpressionRangeLength {
 		cachedQueryRangeSeconds := value.(int)
-		message := createLogMessage("Retrieved query from cache", queryExpressionNormalized, cachedQueryRangeSeconds, queryExpressionRangeLength, nil)
+		message := createLogMessage("Blocked a query from failed query cache", queryExpressionNormalized, cachedQueryRangeSeconds, queryExpressionRangeLength, nil)
 		cachedHits.Inc()
 		return true, message
 	}

internal/cortex/frontend/transport/utils/utils_test.go

@@ -226,7 +226,7 @@ func TestQueryHitCache(t *testing.T) {
 				"query": {"test_query"},
 			},
 			expectedResult:  true,
-			expectedMessage: "Retrieved query from cache, cached_query: test_query, cached_range_seconds: 100, query_range_seconds: 100",
+			expectedMessage: "Blocked a query from failed query cache, cached_query: test_query, cached_range_seconds: 100, query_range_seconds: 100",
 		},
 		{
 			name: "Cache miss",
@@ -258,7 +258,7 @@ func TestQueryHitCache(t *testing.T) {
 				"query": {" \n\ttes \tt \n   query \t\n  "},
 			},
 			expectedResult:  true,
-			expectedMessage: "Retrieved query from cache, cached_query:  tes t query , cached_range_seconds: 100, query_range_seconds: 100",
+			expectedMessage: "Blocked a query from failed query cache, cached_query:  tes t query , cached_range_seconds: 100, query_range_seconds: 100",
 		},
 
 		{

pkg/query/endpointset.go

@@ -360,22 +360,6 @@ func (c *endpointSetNodeCollector) Collect(ch chan<- prometheus.Metric) {
 				groupKey, replicaKeys)
 		}
 	}
-	for replicaKey, occurrencesPerAddr := range c.storeNodesAddr {
-		for addr, occurrences := range occurrencesPerAddr {
-			ch <- prometheus.MustNewConstMetric(
-				c.connectionsWithAddr, prometheus.GaugeValue,
-				float64(occurrences),
-				replicaKey, addr)
-		}
-	}
-	for groupKey, occurrencesPerReplicaKey := range c.storeNodesKeys {
-		for replicaKeys, occurrences := range occurrencesPerReplicaKey {
-			ch <- prometheus.MustNewConstMetric(
-				c.connectionsWithKeys, prometheus.GaugeValue,
-				float64(occurrences),
-				groupKey, replicaKeys)
-		}
-	}
 }
 
 // EndpointSet maintains a set of active Thanos endpoints. It is backed up by Endpoint Specifications that are dynamically fetched on

pkg/receive/handler_test.go

@@ -1847,8 +1847,13 @@ func TestIngestorRestart(t *testing.T) {
 
 	clientAddr := "ingestor.com"
 	dnsBuilder := &dnsResolverBuilder{
-		logger:    logger,
-		addrStore: map[string][]string{clientAddr: {addr2}},
+		logger: logger,
+		addrStore: map[string][]string{
+			addr1:      {addr1},
+			addr2:      {addr2},
+			addr3:      {addr3},
+			clientAddr: {addr2},
+		},
 	}
 	resolver.Register(dnsBuilder)
 	dialOpts := []grpc.DialOption{
@@ -1885,9 +1890,10 @@ func TestIngestorRestart(t *testing.T) {
 	ing3 := startIngestor(logger, addr3, 2*time.Second)
 	defer ing3.Shutdown(err)
 	// bind the new backend to the same DNS
-	dnsBuilder.addrStore[clientAddr] = []string{addr3}
+	// dnsBuilder.addrStore[clientAddr] = append(dnsBuilder.addrStore[clientAddr], addr3)
+	dnsBuilder.addrStore[clientAddr][0] = addr3
 
-	iter, errs := 10, 0
+	iter, errs := 30, 0
 	for i := 0; i < iter; i++ {
 		_, err = client.handleRequest(ctx, 0, "test", data)
 		if err != nil {