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

boltdbshipper: fix crash of "timeout" panic when boltdbshipper do init #3369

Merged
merged 2 commits into from
Feb 26, 2021
Merged

boltdbshipper: fix crash of "timeout" panic when boltdbshipper do init #3369

merged 2 commits into from
Feb 26, 2021

Conversation

zhanghjster
Copy link
Contributor

@zhanghjster zhanghjster commented Feb 22, 2021

When boltdbshipper failed to load an invalid local index file, it try to recover the panic with a newly downloaded index. but it will panic with "timeout" error because the process still hold the flock created by the previous db open operation. This patch do the flock cleanup to make the recovery work.

20210223104528

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

…d to load an invalid local index file, it try to reopen with a newly downloaded index, but it will panic with "timeout" error because the process still hold the flock created by the previous db open. This patch do the flock cleanup.
@CLAassistant
Copy link

CLAassistant commented Feb 22, 2021

CLA assistant check
All committers have signed the CLA.

@pull-request-size pull-request-size bot added size/M and removed size/S labels Feb 26, 2021
@slim-bean
Copy link
Collaborator

This is a really great catch @zhanghjster! Thank you for this PR!!

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM

@slim-bean slim-bean merged commit a3a2c1a into grafana:master Feb 26, 2021
slim-bean added a commit that referenced this pull request Feb 27, 2021
…r do init (#3369)

This appears to have introduced a different problem, still investigating.
slim-bean added a commit that referenced this pull request Feb 27, 2021
* revert: boltdbshipper: fix crash of "timeout" panic when boltdbshipper do init (#3369)

This appears to have introduced a different problem, still investigating.

* Revert "reduce number of list calls on shared object store when using boltdb-shipper (#3283)"

This reverts commit 76e713f
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