Skip results cache, if multi tenants query

simonswine · simonswine · commit b41a4df64a23 · 2020-12-23T12:18:31.000Z
Signed-off-by: Christian Simon &lt;simon@swine.de&gt;
diff --git a/pkg/querier/queryrange/results_cache.go b/pkg/querier/queryrange/results_cache.go
@@ -179,11 +179,17 @@ func NewResultsCacheMiddleware(
 }
 
 func (s resultsCache) Do(ctx context.Context, r Request) (Response, error) {
-	userID, err := tenant.TenantID(ctx)
+	tenantIDs, err := tenant.TenantIDs(ctx)
 	if err != nil {
 		return nil, httpgrpc.Errorf(http.StatusBadRequest, err.Error())
 	}
 
+	// do not cache multi tenant queries
+	if len(tenantIDs) != 1 {
+		return s.next.Do(ctx, r)
+	}
+	userID := tenantIDs[0]
+
 	if s.shouldCache != nil && !s.shouldCache(r) {
 		return s.next.Do(ctx, r)
 	}

Original file line number	Diff line number	Diff line change
`@@ -179,11 +179,17 @@ func NewResultsCacheMiddleware(`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`func (s resultsCache) Do(ctx context.Context, r Request) (Response, error) {`
`182`		`- userID, err := tenant.TenantID(ctx)`
	`182`	`+ tenantIDs, err := tenant.TenantIDs(ctx)`
`183`	`183`	`if err != nil {`
`184`	`184`	`return nil, httpgrpc.Errorf(http.StatusBadRequest, err.Error())`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ // do not cache multi tenant queries`
	`188`	`+ if len(tenantIDs) != 1 {`
	`189`	`+ return s.next.Do(ctx, r)`
	`190`	`+ }`
	`191`	`+ userID := tenantIDs[0]`
	`192`	`+`
`187`	`193`	`if s.shouldCache != nil && !s.shouldCache(r) {`
`188`	`194`	`return s.next.Do(ctx, r)`
`189`	`195`	`}`