Repository navigation
Fix Meta() panic when a source is truncated mid-call - #613
Merged
Merged
Conversation
Store.Meta() made two passes over storageIndex. The second pass re-loaded each source ID and asserted the result to *storage without checking whether the entry still existed. If the truncation loop deleted a source between the two passes, Load returned nil and the type assertion panicked. The second pass existed only because meta.Count was never populated; it overwrote Count with tree.Size(). Maintain meta.Count on the storage whenever the tree changes (insertOrSwap and removeOldestEnvelope) and read it directly in Meta(). Meta() now makes a single pass and no longer re-loads from storageIndex. Also resolved the goal of the TODO comment
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
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.
Description
Store.Meta()made two passes overstorageIndex. The second pass re-loaded each source ID and asserted the result to*storagewithout checking whether the entry still existed. If the truncation loop deleted a source between the two passes,Loadreturnedniland the type assertion panicked.The second pass existed only because
meta.Countwas never populated; it overwroteCountwithtree.Size(). Maintainmeta.Counton the storage whenever the tree changes (insertOrSwapandremoveOldestEnvelope) and read it directly inMeta(). Meta()now makes a single pass and no longer re-loads fromstorageIndex.Also resolved the goal of the
TODOcommentType of change
Testing performed?
Checklist:
mainbranch, or relevant version branchIf you have any questions, or want to get attention for a PR or issue please reach out on the #logging-and-metrics channel in the cloudfoundry slack