fix: Keep blocks referenced by newer metas #13614

salvacorts · 2024-07-22T14:29:14Z

What this PR does / why we need it:

This PR prevents the planner from deleting blocks from a outdated meta that is still referenced by an up to date meta.

Which issue(s) this PR fixes:
Fixes #13612

Checklist

Reviewed the CONTRIBUTING.md guide (required)
Documentation added
Tests updated
Title matches the required conventional commits format, see here
- Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

salvacorts · 2024-07-22T14:42:35Z

pkg/bloomgateway/processor.go

@@ -52,7 +52,7 @@ func (p *processor) processTasks(ctx context.Context, tasks []Task) error {
 	return nil
 }

-func (p *processor) processTasksForDay(ctx context.Context, tenant string, day config.DayTime, tasks []Task) error {


The Go Lint CI was complaining so I fixed these here even though they are unrelated to the PR

chaudum · 2024-07-23T08:28:50Z

pkg/bloombuild/planner/planner.go

+	// Blocks are sorted within a meta, so we can find it with binary search
+	for _, meta := range metas {
+		// Search for the first block whose bound is >= than the target block min bound.
+		i := sort.Search(len(meta.Blocks), func(i int) bool {
+			return meta.Blocks[i].Cmp(uint64(block.Bounds.Max)) <= v1.Overlap
+		})
+
+		if i < len(meta.Blocks) && meta.Blocks[i] == block {
+			return true
+		}
+	}
+
+	return false


how many blocks are usually in a meta? it could be faster to just do a for loop

I’d leave the bin search:

If there are many blocks --> works better

If there are not that many, I don’t think there will be much difference moreover provided this is not on a critical path and is actually done after all the build process is done (or during the planning)

grafanabot · 2024-07-23T09:33:40Z

The backport to k212 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-13614-to-k212 origin/k212
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 784e7d562fedec7134c8ed4e2cee8ccb7049e271

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-13614-to-k212
# Create the PR body template
PR_BODY=$(gh pr view 13614 --json body --template 'Backport 784e7d562fedec7134c8ed4e2cee8ccb7049e271 from #13614{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [k212] fix: Keep blocks referenced by newer metas' --body-file - --label 'size/L' --label 'type/bug' --label 'feature/blooms' --label 'backport' --base k212 --milestone k212 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-13614-to-k212

# Create a pull request where the `base` branch is `k212` and the `compare`/`head` branch is `backport-13614-to-k212`.

# Remove the local backport branch
git switch main
git branch -D backport-13614-to-k212

grafanabot · 2024-07-23T10:22:09Z

The backport to k211 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-13614-to-k211 origin/k211
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 784e7d562fedec7134c8ed4e2cee8ccb7049e271

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-13614-to-k211
# Create the PR body template
PR_BODY=$(gh pr view 13614 --json body --template 'Backport 784e7d562fedec7134c8ed4e2cee8ccb7049e271 from #13614{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [k211] fix: Keep blocks referenced by newer metas' --body-file - --label 'size/L' --label 'type/bug' --label 'feature/blooms' --label 'backport' --base k211 --milestone k211 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-13614-to-k211

# Create a pull request where the `base` branch is `k211` and the `compare`/`head` branch is `backport-13614-to-k211`.

# Remove the local backport branch
git switch main
git branch -D backport-13614-to-k211

grafanabot · 2024-07-23T10:22:12Z

The backport to k212 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-13614-to-k212 origin/k212
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 784e7d562fedec7134c8ed4e2cee8ccb7049e271

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-13614-to-k212
# Create the PR body template
PR_BODY=$(gh pr view 13614 --json body --template 'Backport 784e7d562fedec7134c8ed4e2cee8ccb7049e271 from #13614{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [k212] fix: Keep blocks referenced by newer metas' --body-file - --label 'size/L' --label 'type/bug' --label 'feature/blooms' --label 'backport' --base k212 --milestone k212 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-13614-to-k212

# Create a pull request where the `base` branch is `k212` and the `compare`/`head` branch is `backport-13614-to-k212`.

# Remove the local backport branch
git switch main
git branch -D backport-13614-to-k212

(cherry picked from commit 784e7d5)

Keep blocks referenced by newer metas

e7d02f3

pull-request-size bot added the size/L label Jul 22, 2024

salvacorts changed the title ~~Keep blocks referenced by newer metas~~ fix: Keep blocks referenced by newer metas Jul 22, 2024

salvacorts added type/bug Somehing is not working as expected feature/blooms labels Jul 22, 2024

salvacorts commented Jul 22, 2024

View reviewed changes

salvacorts force-pushed the salvacorts/blooms/keep-blocks-present-in-newer-metas branch from 5d75907 to 696f798 Compare July 22, 2024 14:48

ci fix

6b0da35

salvacorts force-pushed the salvacorts/blooms/keep-blocks-present-in-newer-metas branch from 696f798 to 6b0da35 Compare July 22, 2024 14:52

salvacorts marked this pull request as ready for review July 22, 2024 14:57

salvacorts requested a review from a team as a code owner July 22, 2024 14:57

chaudum approved these changes Jul 23, 2024

View reviewed changes

salvacorts merged commit 784e7d5 into main Jul 23, 2024
61 checks passed

salvacorts deleted the salvacorts/blooms/keep-blocks-present-in-newer-metas branch July 23, 2024 09:30

salvacorts added the backport k212 label Jul 23, 2024

grafanabot added the backport-failed label Jul 23, 2024

salvacorts added backport k211 backport k212 and removed backport k212 labels Jul 23, 2024

salvacorts added a commit that referenced this pull request Jul 23, 2024

fix: Keep blocks referenced by newer metas (#13614)

4234c8b

(cherry picked from commit 784e7d5)

salvacorts mentioned this pull request Jul 23, 2024

chore: [k212] fix: Keep blocks referenced by newer metas #13627

Merged

7 tasks

This was referenced Aug 15, 2024

chore(k215): release 3.2.0 #13905

Open

chore(k216): release 3.2.0 #13929

Open

loki-gh-app bot mentioned this pull request Sep 9, 2024

chore(k218): release 3.2.0 #14088

Merged

loki-gh-app bot mentioned this pull request Sep 23, 2024

chore(k221): release 3.2.0 #14214

Open

loki-gh-app bot mentioned this pull request Sep 30, 2024

chore(k222): release 3.2.0 #14305

Open

loki-gh-app bot mentioned this pull request Oct 7, 2024

chore(k223): release 3.2.0 #14402

Open

This was referenced Oct 14, 2024

chore(k224): release 3.2.0 #14486

Open

chore(k225): release 3.2.0 #14543

Closed

This was referenced Oct 21, 2024

chore(k225): release 3.2.0 #14548

Open

chore(k226): release 3.2.0 #14625

Open

loki-gh-app bot mentioned this pull request Nov 4, 2024

chore(k227): release 3.2.0 #14750

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Keep blocks referenced by newer metas #13614

fix: Keep blocks referenced by newer metas #13614

salvacorts commented Jul 22, 2024

salvacorts Jul 22, 2024

chaudum Jul 23, 2024

salvacorts Jul 23, 2024

grafanabot commented Jul 23, 2024

grafanabot commented Jul 23, 2024

grafanabot commented Jul 23, 2024

fix: Keep blocks referenced by newer metas #13614

fix: Keep blocks referenced by newer metas #13614

Conversation

salvacorts commented Jul 22, 2024

salvacorts Jul 22, 2024

Choose a reason for hiding this comment

chaudum Jul 23, 2024

Choose a reason for hiding this comment

salvacorts Jul 23, 2024

Choose a reason for hiding this comment

grafanabot commented Jul 23, 2024

grafanabot commented Jul 23, 2024

grafanabot commented Jul 23, 2024