[fix] Ensure Badger maintenance is stopped before existing Close()#7940
Merged
yurishkuro merged 1 commit intojaegertracing:mainfrom Feb 1, 2026
Merged
Conversation
Signed-off-by: Yashika0724 <ssyashika1311@gmail.com>
dosubot
bot
added
area/storage
enhancement
storage/badger
Contributor
Author
|
Hi @yurishkuro ! Thanks for taking the time to review this. |
Manik2708
reviewed
Feb 1, 2026
| // Close Implements io.Closer and closes the underlying storage | ||
| func (f *Factory) Close() error { | ||
| close(f.maintenanceDone) | ||
| f.bgWg.Wait() // Wait for background goroutines to finish before closing store |
Contributor
There was a problem hiding this comment.
I can't understand the need! closing the maintenanceDone will close the channel which will close the go routines. How will it lead to race condition? Can you provide the steps for reproducing the race condition or could point to the issue thread
Member
There was a problem hiding this comment.
This is a standard pattern that ensures that goroutines are exiting (i.e. definitely not holding onto any locks or resources) before Close() function exists. This could be helpful in avoiding situations when the process exits while maintenance goroutine still tries to do some writes.
yurishkuro
reviewed
Feb 1, 2026
Comment on lines
181
to
191
| err := f.store.Close() | ||
|
|
||
| // Remove tmp files if this was ephemeral storage | ||
| if f.Config.Ephemeral { | ||
| errSecondary := os.RemoveAll(f.tmpDir) | ||
| if err == nil { | ||
| err = errSecondary | ||
| } | ||
| } | ||
|
|
||
| return err |
Member
There was a problem hiding this comment.
this could've been simplified to do fewer ifs by using errors.Join()
yurishkuro
approved these changes
Feb 1, 2026
yurishkuro
changed the title
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #7940 +/- ##
==========================================
- Coverage 95.58% 95.55% -0.04%
==========================================
Files 316 316
Lines 16726 16734 +8
==========================================
+ Hits 15988 15990 +2
- Misses 576 580 +4
- Partials 162 164 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Metrics Comparison SummaryTotal changes across all snapshots: 0 Detailed changes per snapshotsummary_metrics_snapshot_cassandra📊 Metrics Diff SummaryTotal Changes: 0
summary_metrics_snapshot_cassandra📊 Metrics Diff SummaryTotal Changes: 0
summary_metrics_snapshot_cassandra📊 Metrics Diff SummaryTotal Changes: 0
summary_metrics_snapshot_cassandra📊 Metrics Diff SummaryTotal Changes: 0
|
|
Related Documentation No published documentation to review for changes on this repository. Write your first living document How did I do? Any feedback? |
Parship12
pushed a commit
to Parship12/jaeger
that referenced
this pull request
Feb 11, 2026
…aegertracing#7940) This PR adds synchronization between the Badger storage factory’s background goroutines and store shutdown. During shutdown (for example, pod termination or process restart), the maintenance or metrics goroutines may still be running while the Badger store is being closed. This change ensures the goroutines are allowed to exit cleanly after shutdown is signaled and before the store is closed. The behavior and APIs remain unchanged; the update only makes the shutdown sequence safer and more predictable. Thanks for taking a look, and please let me know if any adjustments are needed. Signed-off-by: Yashika0724 <ssyashika1311@gmail.com>
SoumyaRaikwar
pushed a commit
to SoumyaRaikwar/jaeger
that referenced
this pull request
Feb 13, 2026
…aegertracing#7940) This PR adds synchronization between the Badger storage factory’s background goroutines and store shutdown. During shutdown (for example, pod termination or process restart), the maintenance or metrics goroutines may still be running while the Badger store is being closed. This change ensures the goroutines are allowed to exit cleanly after shutdown is signaled and before the store is closed. The behavior and APIs remain unchanged; the update only makes the shutdown sequence safer and more predictable. Thanks for taking a look, and please let me know if any adjustments are needed. Signed-off-by: Yashika0724 <ssyashika1311@gmail.com>
OlegChumin
pushed a commit
to OlegChumin/jaeger
that referenced
this pull request
Feb 28, 2026
…aegertracing#7940) This PR adds synchronization between the Badger storage factory’s background goroutines and store shutdown. During shutdown (for example, pod termination or process restart), the maintenance or metrics goroutines may still be running while the Badger store is being closed. This change ensures the goroutines are allowed to exit cleanly after shutdown is signaled and before the store is closed. The behavior and APIs remain unchanged; the update only makes the shutdown sequence safer and more predictable. Thanks for taking a look, and please let me know if any adjustments are needed. Signed-off-by: Yashika0724 <ssyashika1311@gmail.com>
singhvibhanshu
pushed a commit
to singhvibhanshu/jaeger
that referenced
this pull request
Mar 18, 2026
…aegertracing#7940) This PR adds synchronization between the Badger storage factory’s background goroutines and store shutdown. During shutdown (for example, pod termination or process restart), the maintenance or metrics goroutines may still be running while the Badger store is being closed. This change ensures the goroutines are allowed to exit cleanly after shutdown is signaled and before the store is closed. The behavior and APIs remain unchanged; the update only makes the shutdown sequence safer and more predictable. Thanks for taking a look, and please let me know if any adjustments are needed. Signed-off-by: Yashika0724 <ssyashika1311@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds synchronization between the Badger storage factory’s background goroutines and store shutdown.
During shutdown (for example, pod termination or process restart), the maintenance or metrics goroutines may still be running while the Badger store is being closed. This change ensures the goroutines are allowed to exit cleanly after shutdown is signaled and before the store is closed.
The behavior and APIs remain unchanged; the update only makes the shutdown sequence safer and more predictable.
Thanks for taking a look, and please let me know if any adjustments are needed.