Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[query] Fix aggregated namespace header to be bad request instead of internal server error #3070

Merged
merged 1 commit into from
Jan 8, 2021
Merged

[query] Fix aggregated namespace header to be bad request instead of internal server error #3070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/query/storage/m3/cluster_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/m3db/m3/src/query/storage"
"github.com/m3db/m3/src/query/storage/m3/consolidators"
"github.com/m3db/m3/src/query/storage/m3/storagemetadata"
xerrors "github.com/m3db/m3/src/x/errors"
)

type unaggregatedNamespaceType uint8
Expand Down Expand Up @@ -346,15 +347,17 @@ func resolveClusterNamespacesForQueryWithRestrictQueryOptions(
Resolution: restrict.StoragePolicy.Resolution().Window,
})
if !ok {
return result(nil,
err := xerrors.NewInvalidParamsError(
fmt.Errorf("could not find namespace for storage policy: %v",
restrict.StoragePolicy.String()))
return result(nil, err)
}

return result(ns, nil)
default:
return result(nil,
err := xerrors.NewInvalidParamsError(
fmt.Errorf("unrecognized metrics type: %v", restrict.MetricsType))
return result(nil, err)
}
}

Expand Down
26 changes: 16 additions & 10 deletions src/query/storage/m3/cluster_resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/m3db/m3/src/query/storage"
"github.com/m3db/m3/src/query/storage/m3/consolidators"
"github.com/m3db/m3/src/query/storage/m3/storagemetadata"
xerrors "github.com/m3db/m3/src/x/errors"
"github.com/m3db/m3/src/x/ident"

"github.com/golang/mock/gomock"
Expand Down Expand Up @@ -162,14 +163,15 @@ func generateClusters(t *testing.T, ctrl *gomock.Controller) Clusters {
}

var testCases = []struct {
name string
queryLength time.Duration
opts *storage.FanoutOptions
restrict *storage.RestrictQueryOptions
expectedType consolidators.QueryFanoutType
expectedClusterNames []string
expectedErr error
expectedErrContains string
name string
queryLength time.Duration
opts *storage.FanoutOptions
restrict *storage.RestrictQueryOptions
expectedType consolidators.QueryFanoutType
expectedClusterNames []string
expectedErr error
expectedErrContains string
expectedErrInvalidParams bool
}{
{
name: "all disabled",
Expand Down Expand Up @@ -355,7 +357,8 @@ var testCases = []struct {
MetricsType: storagemetadata.UnknownMetricsType,
},
},
expectedErrContains: "unrecognized metrics type:",
expectedErrContains: "unrecognized metrics type:",
expectedErrInvalidParams: true,
},
{
name: "restrict with unknown storage policy",
Expand All @@ -366,7 +369,8 @@ var testCases = []struct {
StoragePolicy: policy.MustParseStoragePolicy("1s:100d"),
},
},
expectedErrContains: "could not find namespace for storage policy:",
expectedErrContains: "could not find namespace for storage policy:",
expectedErrInvalidParams: true,
},
}

Expand Down Expand Up @@ -398,6 +402,8 @@ func TestResolveClusterNamespacesForQueryWithOptions(t *testing.T) {
assert.Error(t, err)
assert.True(t, strings.Contains(err.Error(), substr))
assert.Nil(t, clusters)
invalidParams := xerrors.IsInvalidParams(err)
assert.Equal(t, tt.expectedErrInvalidParams, invalidParams)
return
}

Expand Down