Automated cherry pick of #6890: Fix machine types with klog #6893: /etc/hosts (gossip): Stronger logic #6898: Add i3en #6933
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
* Add a mutex around /etc/hosts updates (for a little extra safety) * Don't write unchanged files * Recover from out-of-sequence guard lines * Add tests Thanks to granular-ryanbonham for the suggestions & finding the issue!
When we have multiple writers racing to write /etc/hosts, we could have file corruption where we see a mix of both files. We can't use a traditional atomic file write, because we are bind-mounting /etc/hosts. Instead we write to /etc/hosts, pause, then re-read the contents. If the contents don't match, we repeat. This will not result in fair queuing, but will avoid corruption.
k8s-ci-robot
added
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mikesplain The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
/assign @justinsb |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
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.
Cherry pick of #6890 #6893 #6898 on release-1.13.
#6890: Fix machine types with klog
#6893: /etc/hosts (gossip): Stronger logic
#6898: Add i3en