Skip to content

Store,Compactor: Thanos sharding #1583

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

Merged
bwplotka merged 13 commits into from
Oct 9, 2019
Merged

Store,Compactor: Thanos sharding #1583

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f99502e
Add selector.relabel-config flag && expose advertised label for store…
jojohappy Sep 29, 2019
94d02ca
To allow the duplicate external labels with different components && E…
jojohappy Sep 29, 2019
44483d6
Remove dropped block dir
jojohappy Sep 30, 2019
65da803
Compact: support sharding compactor
jojohappy Sep 30, 2019
6a95f51
Add CHANGELOG
jojohappy Sep 30, 2019
b560510
Fixed docs and lints
jojohappy Sep 30, 2019
f0ce02a
Fixed when no specific storeType
jojohappy Sep 30, 2019
b52a238
Add test
jojohappy Oct 8, 2019
a210289
Rebase master && update storeset test
jojohappy Oct 8, 2019
76b9981
Update docs
jojohappy Oct 8, 2019
d27bb87
Fixed unstable test
jojohappy Oct 8, 2019
de9a47f
Address review comments
jojohappy Oct 9, 2019
148828d
Add e2e test
jojohappy Oct 9, 2019
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
Prev Previous commit
Next Next commit
To allow the duplicate external labels with different components && E… 
…mpty labels when no relabel configuration

Signed-off-by: jojohappy <sarahdj0917@gmail.com>
  • Loading branch information
@jojohappy
jojohappy committed Oct 8, 2019
commit 94d02ca83c9aab2f44615315793a47bf99aaa7c9
4 changes: 4 additions & 0 deletions pkg/query/storeset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ func externalLabelsFromStore(store *storeRef) string {
}
sort.Strings(tsdbLabelSetStrings)

// Append the storeType to the end of list, because the store gateway will be exposed external labels,
// we allow the duplicate external labels with different components.
tsdbLabelSetStrings = append(tsdbLabelSetStrings, store.storeType.String())

return strings.Join(tsdbLabelSetStrings, ",")
}

Expand Down
30 changes: 16 additions & 14 deletions pkg/store/bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,23 +542,25 @@ func (s *BucketStore) Info(context.Context, *storepb.InfoRequest) (*storepb.Info
MaxTime: maxt,
}

labelSets := make(map[uint64][]storepb.Label, len(s.blocks))
for _, bs := range s.blocks {
ls := map[string]string{}
for _, l := range bs.labels {
ls[l.Name] = l.Value
}
if len(s.relabelConfig) != 0 {
Copy link
Member

@bwplotka bwplotka Oct 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would vote to precompute this every sync instead of computing this on every Info which is frequent (at least every 5s)

labelSets := make(map[uint64][]storepb.Label, len(s.blocks))
for _, bs := range s.blocks {
ls := map[string]string{}
for _, l := range bs.labels {
ls[l.Name] = l.Value
}

res := []storepb.Label{}
for k, v := range ls {
res = append(res, storepb.Label{Name: k, Value: v})
res := []storepb.Label{}
for k, v := range ls {
res = append(res, storepb.Label{Name: k, Value: v})
}
labelSets[bs.labels.Hash()] = res
}
labelSets[bs.labels.Hash()] = res
}

res.LabelSets = make([]storepb.LabelSet, 0, len(labelSets))
for _, v := range labelSets {
res.LabelSets = append(res.LabelSets, storepb.LabelSet{Labels: v})
res.LabelSets = make([]storepb.LabelSet, 0, len(labelSets))
for _, v := range labelSets {
res.LabelSets = append(res.LabelSets, storepb.LabelSet{Labels: v})
}
}

return res, nil
Expand Down