[1.8.0] https://github.com/freedomofpress/securedrop/pull/5855 and 1.8.0-rc4 #5856
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
(cherry picked from commit a98e91c)
Builds on the work by @rmol in #5853. Slots in overrides to the apt-daily{,-upgrade} timers, shipped with the 'apt' package, to provide fine-grained control over the update and reboot times. Ensures that the apt lists are updated approximately 1h prior to the package upgrade. Lowered the time-fuzzing to 20m on each action, so that even at the extremes, there's still a 20m window for an apt update to complete. Uses a modulus to determine the sooner update time. (cherry picked from commit 34fdc7a)
"Now" was the default value, we previously set it to the 'daily_reboot_time' to provide some predictability around reboots, but that came at the cost of separating the package updates from the reboot logic. Ideally, we'll have as narrow gap as possible between: * apt update * apt upgrade * reboot and these changes implement that. (cherry picked from commit bddeb5e)
Uses apt-config directly, rather than naively checking the config files. That gives us a more accurate picture of what the system state is. (cherry picked from commit 1bc7452)
(cherry picked from commit b349d71)
Revision, based on discussion. It turns out that setting reboot time to "now" causes reboots even during download-only stages, which isn't the behavior we want. Let's stagger the actions: * apt-get update * apt-get upgrade * reboot all approximately 1h apart (with 20m random delay on the apt-get actions). This reverts commit bddeb5e. (cherry picked from commit 74fadb8)
conorsch
approved these changes
Mar 10, 2021
|
CI is passing, merging! |
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.
Status
Ready for review
Description of Changes
Backports #5855 to the release/1.8.0 branch
Testing
release/1.8.0