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

chore: Remove unused stream index from RF1 ingester #13758

Merged
merged 2 commits into from
Aug 7, 2024
Merged

chore: Remove unused stream index from RF1 ingester #13758

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9734141
chore: Clean up indexes after cleaning up stream :dev:
benclive Aug 5, 2024
db71e74
clarity
benclive Aug 5, 2024
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
15 changes: 3 additions & 12 deletions pkg/ingester-rf1/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/grafana/loki/v3/pkg/analytics"
"github.com/grafana/loki/v3/pkg/chunkenc"
"github.com/grafana/loki/v3/pkg/distributor/writefailures"
"github.com/grafana/loki/v3/pkg/ingester/index"
"github.com/grafana/loki/v3/pkg/loghttp/push"
"github.com/grafana/loki/v3/pkg/logproto"
"github.com/grafana/loki/v3/pkg/logql/syntax"
Expand Down Expand Up @@ -61,7 +60,6 @@ type instance struct {
buf []byte // buffer used to compute fps.
streams *streamsMap

index *index.Multi
mapper *FpMapper // using of mapper no longer needs mutex because reading from streams is lock-free

instanceID string
Expand Down Expand Up @@ -140,18 +138,13 @@ func newInstance(
customStreamsTracker push.UsageTracker,
logger log.Logger,
) (*instance, error) {
invertedIndex, err := index.NewMultiInvertedIndex(periodConfigs, uint32(cfg.IndexShards))
if err != nil {
return nil, err
}
streams := newStreamsMap()
ownedStreamsSvc := newOwnedStreamService(instanceID, limiter)
c := config.SchemaConfig{Configs: periodConfigs}
i := &instance{
cfg: cfg,
streams: streams,
buf: make([]byte, 0, 1024),
index: invertedIndex,
instanceID: instanceID,
//
streamsCreatedTotal: streamsCreatedTotal.WithLabelValues(instanceID),
Expand Down Expand Up @@ -182,7 +175,7 @@ func (i *instance) createStream(ctx context.Context, pushReqStream logproto.Stre
// reducing the stream limits, for instance.
var err error

labels, err := syntax.ParseLabels(pushReqStream.Labels)
sortedLabels, err := syntax.ParseLabels(pushReqStream.Labels)
if err != nil {
if i.configs.LogStreamCreation(i.instanceID) {
level.Debug(util_log.Logger).Log(
Expand All @@ -196,12 +189,10 @@ func (i *instance) createStream(ctx context.Context, pushReqStream logproto.Stre
}

if err != nil {
return i.onStreamCreationError(ctx, pushReqStream, err, labels)
return i.onStreamCreationError(ctx, pushReqStream, err, sortedLabels)
}

fp := i.getHashForLabels(labels)

sortedLabels := i.index.Add(logproto.FromLabelsToLabelAdapters(labels), fp)
fp := i.getHashForLabels(sortedLabels)

chunkfmt, headfmt, err := i.chunkFormatAt(minTs(&pushReqStream))
if err != nil {
Expand Down
Loading