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

Fix block reload in local-blocks #3742

Merged
merged 4 commits into from
May 31, 2024
Merged

Fix block reload in local-blocks #3742

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0988c7
Fix stuff
mapno May 30, 2024
1d47e7d
Minor fixes
mapno May 31, 2024
68ed2fb
Add one more log line
mapno May 31, 2024
ed1f24d
Specify flushed
mapno May 31, 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
24 changes: 23 additions & 1 deletion modules/generator/processor/localblocks/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,12 +634,25 @@ func (p *Processor) deleteOldBlocks() (err error) {
}

for id, b := range p.completeBlocks {
if !p.Cfg.FlushToStorage {
if b.BlockMeta().EndTime.Before(before) {
level.Info(p.logger).Log("msg", "deleting complete block", "block", id.String())
err = p.wal.LocalBackend().ClearBlock(id, p.tenant)
if err != nil {
return err
}
delete(p.completeBlocks, id)
}
continue
}

flushedTime := b.FlushedTime()
if flushedTime.IsZero() {
continue
}

if flushedTime.Add(p.Cfg.CompleteBlockTimeout).Before(time.Now()) {
level.Info(p.logger).Log("msg", "deleting flushed complete block", "block", id.String())
err = p.wal.LocalBackend().ClearBlock(id, p.tenant)
if err != nil {
return err
Expand Down Expand Up @@ -773,12 +786,15 @@ func (p *Processor) reloadBlocks() error {
if err != nil {
return err
}
level.Info(p.logger).Log("msg", "reloading wal blocks", "count", len(walBlocks))
for _, blk := range walBlocks {
meta := blk.BlockMeta()
if meta.TenantID == p.tenant {
level.Info(p.logger).Log("msg", "reloading wal block", "block", meta.BlockID.String())
p.walBlocks[blk.BlockMeta().BlockID] = blk
}
}
level.Info(p.logger).Log("msg", "reloaded wal blocks", "count", len(p.walBlocks))

// ------------------------------------
// Complete blocks
Expand All @@ -791,15 +807,18 @@ func (p *Processor) reloadBlocks() error {
return err
}
if len(tenants) == 0 {
level.Info(p.logger).Log("msg", "no tenants found, skipping complete block replay")
return nil
}

ids, _, err := r.Blocks(ctx, p.tenant)
if err != nil {
return err
}
level.Info(p.logger).Log("msg", "reloading complete blocks", "count", len(ids))

for _, id := range ids {
level.Info(p.logger).Log("msg", "reloading complete block", "block", id.String())
meta, err := r.BlockMeta(ctx, id, t)

var clearBlock bool
Expand All @@ -811,6 +830,7 @@ func (p *Processor) reloadBlocks() error {
}

if clearBlock {
level.Info(p.logger).Log("msg", "clearing block", "block", id.String(), "err", err)
// Partially written block, delete and continue
err = l.ClearBlock(id, t)
if err != nil {
Expand All @@ -827,11 +847,13 @@ func (p *Processor) reloadBlocks() error {
if err != nil {
return err
}
level.Info(p.logger).Log("msg", "reloaded complete block", "block", id.String())

lb := ingester.NewLocalBlock(ctx, blk, l)
p.completeBlocks[id] = lb

if lb.FlushedTime().IsZero() {
if p.Cfg.FlushToStorage && lb.FlushedTime().IsZero() {
level.Info(p.logger).Log("msg", "queueing reloaded block for flushing", "block", id.String())
if _, err := p.flushqueue.Enqueue(newFlushOp(id)); err != nil {
_ = level.Error(p.logger).Log("msg", "local blocks processor failed to enqueue block for flushing during replay", "err", err)
}
Expand Down
Loading