Allow replacing tombstone with a non-tombstone #31494
Merged
Conversation
This file contains 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
Codecov Report
@@ Coverage Diff @@
## master #31494 +/- ##
=======================================
Coverage 81.4% 81.4%
=======================================
Files 731 731
Lines 208720 208734 +14
=======================================
+ Hits 169980 170008 +28
+ Misses 38740 38726 -14 |
Lichtso
approved these changes
May 4, 2023
ryoqun
reviewed
Aug 25, 2023
| } else if existing.is_tombstone() && !entry.is_tombstone() { | ||
| // The old entry is tombstone and the new one is not. Let's give the new entry | ||
| // a chance. | ||
| second_level.swap_remove(entry_index); |
There was a problem hiding this comment.
for the record: this newly-added instance of .swap_remove() is fixed at #32973
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.
Problem
The program loading fails at deployment due to existence of a tombstone.
Summary of Changes
This was observed in unit tests where the program was being deployed. During deployment, the bank tried to load the program, as the owner matches the loader. But the verification of the program failed, and it resulted in a tombstone in the cache.
After the successful deployment, the bank tries to add the new program to the cache, but the slot matches with the tombstone's slots (since delay visibility feature is not yet enabled, the effective slot for the program is same as the deployment slot).
This change allows the replacement of the tombstone with a non-tombstone entry even though the slots match between the two entry. Also adds a unit test to test this case.
Fixes #