Skip to content

fix: flaky TestWalBlockFindTraceByID test#4787

Merged
javiermolinar merged 3 commits intografana:mainfrom
javiermolinar:tempo-fix-flaky
Mar 4, 2025
Merged

fix: flaky TestWalBlockFindTraceByID test#4787
javiermolinar merged 3 commits intografana:mainfrom
javiermolinar:tempo-fix-flaky

Conversation

@javiermolinar
Copy link
Copy Markdown
Contributor

@javiermolinar javiermolinar commented Mar 4, 2025

What this PR does:
It fix a test with a non deterministic behaviour

Checklist

  • Tests updated
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Comment thread tempodb/encoding/vparquet4/wal_block_test.go
@javiermolinar javiermolinar merged commit 19556c7 into grafana:main Mar 4, 2025
@github-actions
Copy link
Copy Markdown
Contributor

The backport to release-v2.7 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-4787-to-release-v2.7 origin/release-v2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 19556c7e72311cfdd1079e597f2d961aa721c2df

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-4787-to-release-v2.7
# Create the PR body template
PR_BODY=$(gh pr view 4787 --json body --template 'Backport 19556c7e72311cfdd1079e597f2d961aa721c2df from #4787{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.7] fix: flaky TestWalBlockFindTraceByID test' --body-file - --label 'type/ci' --label 'backport' --base release-v2.7 --milestone release-v2.7 --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-4787-to-release-v2.7

# Create a pull request where the `base` branch is `release-v2.7` and the `compare`/`head` branch is `backport-4787-to-release-v2.7`.

# Remove the local backport branch
git switch main
git branch -D backport-4787-to-release-v2.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants