Skip to content

chore: Small code clean up #5031

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

Merged
merged 1 commit into from
Dec 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions pkg/storage/tsdb/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ const (
// set when shipping blocks to the storage.
IngesterIDExternalLabel = "__ingester_id__"

// ShardIDExternalLabel is the external label containing the shard ID
// and can be used to shard blocks.
ShardIDExternalLabel = "__shard_id__"

// How often are open TSDBs checked for being idle and closed.
DefaultCloseIdleTSDBInterval = 5 * time.Minute

Expand Down
1 change: 0 additions & 1 deletion pkg/storegateway/bucket_stores.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,6 @@ func (u *BucketStores) getOrCreateStore(userID string) (*store.BucketStore, erro
NewReplicaLabelRemover(userLogger, []string{
tsdb.TenantIDExternalLabel,
tsdb.IngesterIDExternalLabel,
tsdb.ShardIDExternalLabel,
}),
// Remove Cortex external labels so that they're not injected when querying blocks.
}...)
Expand Down
1 change: 0 additions & 1 deletion pkg/storegateway/gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,6 @@ func TestStoreGateway_SeriesQueryingShouldRemoveExternalLabels(t *testing.T) {
Labels: map[string]string{
cortex_tsdb.TenantIDExternalLabel: userID,
cortex_tsdb.IngesterIDExternalLabel: fmt.Sprintf("ingester-%d", idx),
cortex_tsdb.ShardIDExternalLabel: fmt.Sprintf("shard-%d", idx),
},
Source: metadata.TestSource,
}
Expand Down