-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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.
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
Added -querier.query_timeout support #788
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,229 @@ | ||
| package querier | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "time" | ||
|
|
||
| "github.com/cortexproject/cortex/pkg/chunk" | ||
| cortex_client "github.com/cortexproject/cortex/pkg/ingester/client" | ||
| "github.com/cortexproject/cortex/pkg/ring" | ||
| "github.com/grafana/loki/pkg/ingester/client" | ||
| "github.com/grafana/loki/pkg/iter" | ||
| "github.com/grafana/loki/pkg/logproto" | ||
| "github.com/grafana/loki/pkg/util" | ||
| "github.com/prometheus/client_golang/prometheus" | ||
| "github.com/prometheus/common/model" | ||
| "github.com/prometheus/prometheus/pkg/labels" | ||
| "google.golang.org/grpc" | ||
| "google.golang.org/grpc/health/grpc_health_v1" | ||
| grpc_metadata "google.golang.org/grpc/metadata" | ||
| ) | ||
|
|
||
| // querierClientMock is a mockable version of QuerierClient, used in querier | ||
| // unit tests to control the behaviour of a remote ingester | ||
| type querierClientMock struct { | ||
| util.ExtendedMock | ||
| grpc_health_v1.HealthClient | ||
| logproto.QuerierClient | ||
| } | ||
|
|
||
| func newQuerierClientMock() *querierClientMock { | ||
| return &querierClientMock{} | ||
| } | ||
|
|
||
| func (c *querierClientMock) Query(ctx context.Context, in *logproto.QueryRequest, opts ...grpc.CallOption) (logproto.Querier_QueryClient, error) { | ||
| args := c.Called(ctx, in, opts) | ||
| return args.Get(0).(logproto.Querier_QueryClient), args.Error(1) | ||
| } | ||
|
|
||
| func (c *querierClientMock) Label(ctx context.Context, in *logproto.LabelRequest, opts ...grpc.CallOption) (*logproto.LabelResponse, error) { | ||
| args := c.Called(ctx, in, opts) | ||
| return args.Get(0).(*logproto.LabelResponse), args.Error(1) | ||
| } | ||
|
|
||
| func (c *querierClientMock) Tail(ctx context.Context, in *logproto.TailRequest, opts ...grpc.CallOption) (logproto.Querier_TailClient, error) { | ||
| args := c.Called(ctx, in, opts) | ||
| return args.Get(0).(logproto.Querier_TailClient), args.Error(1) | ||
| } | ||
|
|
||
| // newIngesterClientMockFactory creates a factory function always returning | ||
| // the input querierClientMock | ||
| func newIngesterClientMockFactory(c *querierClientMock) cortex_client.Factory { | ||
| return func(addr string) (grpc_health_v1.HealthClient, error) { | ||
| return c, nil | ||
| } | ||
| } | ||
|
|
||
| // mockIngesterClientConfig returns an ingester client config suitable for testing | ||
| func mockIngesterClientConfig() client.Config { | ||
| return client.Config{ | ||
| PoolConfig: cortex_client.PoolConfig{ | ||
| ClientCleanupPeriod: 1 * time.Minute, | ||
| HealthCheckIngesters: false, | ||
| RemoteTimeout: 1 * time.Second, | ||
| }, | ||
| MaxRecvMsgSize: 1024, | ||
| RemoteTimeout: 1 * time.Second, | ||
| } | ||
| } | ||
|
|
||
| // queryClientMock is a mockable version of Querier_QueryClient | ||
| type queryClientMock struct { | ||
| util.ExtendedMock | ||
| logproto.Querier_QueryClient | ||
| } | ||
|
|
||
| func newQueryClientMock() *queryClientMock { | ||
| return &queryClientMock{} | ||
| } | ||
|
|
||
| func (c *queryClientMock) Recv() (*logproto.QueryResponse, error) { | ||
| args := c.Called() | ||
| return args.Get(0).(*logproto.QueryResponse), args.Error(1) | ||
| } | ||
|
|
||
| func (c *queryClientMock) Header() (grpc_metadata.MD, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| func (c *queryClientMock) Trailer() grpc_metadata.MD { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *queryClientMock) CloseSend() error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *queryClientMock) SendMsg(m interface{}) error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *queryClientMock) RecvMsg(m interface{}) error { | ||
| return nil | ||
| } | ||
|
|
||
| // tailClientMock is mockable version of Querier_TailClient | ||
| type tailClientMock struct { | ||
| util.ExtendedMock | ||
| logproto.Querier_TailClient | ||
| } | ||
|
|
||
| func newTailClientMock() *tailClientMock { | ||
| return &tailClientMock{} | ||
| } | ||
|
|
||
| func (c *tailClientMock) Recv() (*logproto.TailResponse, error) { | ||
| args := c.Called() | ||
| return args.Get(0).(*logproto.TailResponse), args.Error(1) | ||
| } | ||
|
|
||
| func (c *tailClientMock) Header() (grpc_metadata.MD, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| func (c *tailClientMock) Trailer() grpc_metadata.MD { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *tailClientMock) CloseSend() error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *tailClientMock) SendMsg(m interface{}) error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *tailClientMock) RecvMsg(m interface{}) error { | ||
| return nil | ||
| } | ||
|
|
||
| // storeMock is a mockable version of Loki's storage, used in querier unit tests | ||
| // to control the behaviour of the store without really hitting any storage backend | ||
| type storeMock struct { | ||
| util.ExtendedMock | ||
| } | ||
|
|
||
| func newStoreMock() *storeMock { | ||
| return &storeMock{} | ||
| } | ||
|
|
||
| func (s *storeMock) LazyQuery(ctx context.Context, req *logproto.QueryRequest) (iter.EntryIterator, error) { | ||
| args := s.Called(ctx, req) | ||
| return args.Get(0).(iter.EntryIterator), args.Error(1) | ||
| } | ||
|
|
||
| func (s *storeMock) Get(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([]chunk.Chunk, error) { | ||
| args := s.Called(ctx, from, through, matchers) | ||
| return args.Get(0).([]chunk.Chunk), args.Error(1) | ||
| } | ||
|
|
||
| func (s *storeMock) GetChunkRefs(ctx context.Context, from, through model.Time, matchers ...*labels.Matcher) ([][]chunk.Chunk, []*chunk.Fetcher, error) { | ||
| args := s.Called(ctx, from, through, matchers) | ||
| return args.Get(0).([][]chunk.Chunk), args.Get(0).([]*chunk.Fetcher), args.Error(2) | ||
| } | ||
|
|
||
| func (s *storeMock) Put(ctx context.Context, chunks []chunk.Chunk) error { | ||
| return errors.New("storeMock.Put() has not been mocked") | ||
| } | ||
|
|
||
| func (s *storeMock) PutOne(ctx context.Context, from, through model.Time, chunk chunk.Chunk) error { | ||
| return errors.New("storeMock.PutOne() has not been mocked") | ||
| } | ||
|
|
||
| func (s *storeMock) LabelValuesForMetricName(ctx context.Context, from, through model.Time, metricName string, labelName string) ([]string, error) { | ||
| args := s.Called(ctx, from, through, metricName, labelName) | ||
| return args.Get(0).([]string), args.Error(1) | ||
| } | ||
|
|
||
| func (s *storeMock) LabelNamesForMetricName(ctx context.Context, from, through model.Time, metricName string) ([]string, error) { | ||
| args := s.Called(ctx, from, through, metricName) | ||
| return args.Get(0).([]string), args.Error(1) | ||
| } | ||
|
|
||
| func (s *storeMock) Stop() { | ||
|
|
||
| } | ||
|
|
||
| // readRingMock is a mocked version of a ReadRing, used in querier unit tests | ||
| // to control the pool of ingesters available | ||
| type readRingMock struct { | ||
| replicationSet ring.ReplicationSet | ||
| } | ||
|
|
||
| func newReadRingMock(ingesters []ring.IngesterDesc) *readRingMock { | ||
| return &readRingMock{ | ||
| replicationSet: ring.ReplicationSet{ | ||
| Ingesters: ingesters, | ||
| MaxErrors: 0, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func (r *readRingMock) Describe(ch chan<- *prometheus.Desc) { | ||
| } | ||
|
|
||
| func (r *readRingMock) Collect(ch chan<- prometheus.Metric) { | ||
| } | ||
|
|
||
| func (r *readRingMock) Get(key uint32, op ring.Operation) (ring.ReplicationSet, error) { | ||
| return r.replicationSet, nil | ||
| } | ||
|
|
||
| func (r *readRingMock) BatchGet(keys []uint32, op ring.Operation) ([]ring.ReplicationSet, error) { | ||
| return []ring.ReplicationSet{r.replicationSet}, nil | ||
| } | ||
|
|
||
| func (r *readRingMock) GetAll() (ring.ReplicationSet, error) { | ||
| return r.replicationSet, nil | ||
| } | ||
|
|
||
| func (r *readRingMock) ReplicationFactor() int { | ||
| return 1 | ||
| } | ||
|
|
||
| func mockReadRingWithOneActiveIngester() *readRingMock { | ||
| return newReadRingMock([]ring.IngesterDesc{ | ||
| {Addr: "test", Timestamp: time.Now().UnixNano(), State: ring.ACTIVE, Tokens: []uint32{1, 2, 3}}, | ||
| }) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch yeah !