fix: don't clear last successful boot patch on rollback #284
Conversation
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
Codecov ReportAll modified and coverable lines are covered by tests ✅ 📢 Thoughts on this report? Let us know! |
eseidel
reviewed
Jul 2, 2025
| self.patches_state.known_bad_patches.contains(&patch_number) | ||
| } | ||
|
|
||
| fn remove_patch(&mut self, patch_number: usize) -> Result<()> { |
Contributor
There was a problem hiding this comment.
If this is only used for the rollback case, we should comment that.
eseidel
reviewed
Jul 2, 2025
| self.try_fall_back_from_patch(patch_number) | ||
| self.delete_patch_artifacts(patch_number)?; | ||
| // If the patch to remove is the next boot patch, clear it. | ||
| if let Some(next_boot_patch) = self.patches_state.next_boot_patch.clone() { |
Contributor
There was a problem hiding this comment.
So the change here is to clear the next_boot_patch if it happens to be the same as the patch being removed. Do we need to clear it from other fields as well?
eseidel
requested changes
Jul 2, 2025
Contributor
eseidel
left a comment
There was a problem hiding this comment.
Bryan noted over discord that there are more issues here (notably I believe we don't clear the last_boot_patch after the rollback) so pausing this for now.
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
Fixes shorebirdtech/shorebird#3206
The ultimate issue: rolled back patches were being removed from the "last successfully booted patch" state field. This (correctly) happens with boot failures, but in a rollback scenario, it means that the next boot patch and last booted patch both end up being null, causing
shorebird_code_pushto report that it is up-to-date when it should either report that an update is available (if an earlier patch is available) or that a restart is required (if the rollback is reverting to the base release)Note:
This is still a draft. This has a bug where rolling back to the base release doesn't entirely work (last booted patch does not get overwritten and the app reports patch 1, despite actually running the release)
Type of Change