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.

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: snapshot recover from exporter error (backport #13935) #15273

Merged
merged 5 commits into from
Mar 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 6, 2023

This is an automatic backport of pull request #13935 done by Mergify.
Cherry-pick of 183dde8 has failed:

On branch mergify/bp/release/v0.47.x/pr-13935
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit 183dde8d0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   store/rootmulti/store.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: Marko <[email protected]>
Co-authored-by: Emmanuel T Odeke <[email protected]>
Co-authored-by: Marko <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
(cherry picked from commit 183dde8)

# Conflicts:
#	store/rootmulti/store.go
@mergify mergify bot requested a review from a team as a code owner March 6, 2023 16:51
@mergify mergify bot added the conflicts label Mar 6, 2023
@mergify mergify bot mentioned this pull request Mar 6, 2023
18 tasks
exporter, err := store.Export(int64(height))
if exporter == nil {
Copy link
Member

@julienrbrt julienrbrt Mar 6, 2023

Choose a reason for hiding this comment

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

@julienrbrt julienrbrt enabled auto-merge (squash) March 6, 2023 17:09
@julienrbrt julienrbrt merged commit 2105424 into release/v0.47.x Mar 6, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-13935 branch March 6, 2023 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants