Change GetPriority to not throw error

Author: justinjung04

pkg/querier/tripperware/priority.go

@@ -1,28 +1,14 @@
 package tripperware
 
 import (
-	"errors"
 	"time"
 
 	"github.com/cortexproject/cortex/pkg/util/validation"
 )
 
-var (
-	errQueryPriorityDisabled = errors.New("query priority disabled")
-	errEmptyQueryString      = errors.New("empty query string")
-)
-
-func GetPriority(query string, minTime, maxTime int64, now time.Time, queryPriority validation.QueryPriority) (int64, error) {
-	if !queryPriority.Enabled {
-		return 0, errQueryPriorityDisabled
-	}
-
-	if query == "" {
-		return 0, errEmptyQueryString
-	}
-
-	if len(queryPriority.Priorities) == 0 {
-		return queryPriority.DefaultPriority, nil
+func GetPriority(query string, minTime, maxTime int64, now time.Time, queryPriority validation.QueryPriority) int64 {
+	if !queryPriority.Enabled || query == "" || len(queryPriority.Priorities) == 0 {
+		return queryPriority.DefaultPriority
 	}
 
 	for _, priority := range queryPriority.Priorities {
@@ -34,12 +20,12 @@ func GetPriority(query string, minTime, maxTime int64, now time.Time, queryPrior
 			}
 
 			if isWithinTimeAttributes(attribute.TimeWindow, now, minTime, maxTime) {
-				return priority.Priority, nil
+				return priority.Priority
 			}
 		}
 	}
 
-	return queryPriority.DefaultPriority, nil
+	return queryPriority.DefaultPriority
 }
 
 func isWithinTimeAttributes(timeWindow validation.TimeWindow, now time.Time, startTime, endTime int64) bool {

pkg/querier/tripperware/priority_test.go

@@ -29,31 +29,23 @@ func Test_GetPriorityShouldReturnDefaultPriorityIfNotEnabledOrInvalidQueryString
 
 	type testCase struct {
 		query                string
-		err                  error
 		queryPriorityEnabled bool
 	}
 
 	tests := map[string]testCase{
 		"should miss if query priority not enabled": {
 			query: "up",
-			err:   errQueryPriorityDisabled,
 		},
 		"should miss if query string empty": {
 			query:                "",
-			err:                  errEmptyQueryString,
 			queryPriorityEnabled: true,
 		},
 	}
 
 	for testName, testData := range tests {
 		t.Run(testName, func(t *testing.T) {
 			limits.queryPriority.Enabled = testData.queryPriorityEnabled
-			priority, err := GetPriority(testData.query, 0, 0, now, limits.queryPriority)
-			if err != nil {
-				assert.Equal(t, testData.err, err)
-			} else {
-				assert.NoError(t, err)
-			}
+			priority := GetPriority(testData.query, 0, 0, now, limits.queryPriority)
 			assert.Equal(t, int64(0), priority)
 		})
 	}
@@ -111,8 +103,7 @@ func Test_GetPriorityShouldConsiderRegex(t *testing.T) {
 		t.Run(testName, func(t *testing.T) {
 			limits.queryPriority.Priorities[0].QueryAttributes[0].Regex = testData.regex
 			limits.queryPriority.Priorities[0].QueryAttributes[0].CompiledRegex = regexp.MustCompile(testData.regex)
-			priority, err := GetPriority(testData.query, 0, 0, now, limits.queryPriority)
-			assert.NoError(t, err)
+			priority := GetPriority(testData.query, 0, 0, now, limits.queryPriority)
 			assert.Equal(t, int64(testData.expectedPriority), priority)
 		})
 	}
@@ -180,8 +171,7 @@ func Test_GetPriorityShouldConsiderStartAndEndTime(t *testing.T) {
 
 	for testName, testData := range tests {
 		t.Run(testName, func(t *testing.T) {
-			priority, err := GetPriority("sum(up)", testData.start.UnixMilli(), testData.end.UnixMilli(), now, limits.queryPriority)
-			assert.NoError(t, err)
+			priority := GetPriority("sum(up)", testData.start.UnixMilli(), testData.end.UnixMilli(), now, limits.queryPriority)
 			assert.Equal(t, int64(testData.expectedPriority), priority)
 		})
 	}
@@ -225,8 +215,7 @@ func Test_GetPriorityShouldNotConsiderStartAndEndTimeIfEmpty(t *testing.T) {
 
 	for testName, testData := range tests {
 		t.Run(testName, func(t *testing.T) {
-			priority, err := GetPriority("sum(up)", testData.start.Unix(), testData.end.Unix(), now, limits.queryPriority)
-			assert.NoError(t, err)
+			priority := GetPriority("sum(up)", testData.start.Unix(), testData.end.Unix(), now, limits.queryPriority)
 			assert.Equal(t, int64(1), priority)
 		})
 	}

pkg/querier/tripperware/roundtrip.go

@@ -170,12 +170,8 @@ func NewQueryTripperware(
 					*r = *r.WithContext(context.WithValue(r.Context(), DataFetchedMaxTimeCtxKey, maxTime))
 
 					if limits != nil && limits.QueryPriority(userStr).Enabled {
-						priority, err := GetPriority(query, minTime, maxTime, now, limits.QueryPriority(userStr))
-						if err != nil {
-							level.Debug(log).Log("msg", "failed to get query priority for user", "user", userStr, "err", err.Error())
-						} else {
-							*r = *r.WithContext(context.WithValue(r.Context(), QueryPriorityCtxKey, priority))
-						}
+						priority := GetPriority(query, minTime, maxTime, now, limits.QueryPriority(userStr))
+						*r = *r.WithContext(context.WithValue(r.Context(), QueryPriorityCtxKey, priority))
 					}
 				}