Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid concurrent write corruption to /etc/hosts #6893

Merged
merged 2 commits into from
May 9, 2019

Conversation

justinsb
Copy link
Member

@justinsb justinsb commented May 7, 2019

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.

justinsb added 2 commits May 6, 2019 22:09
* 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 k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 7, 2019
@justinsb
Copy link
Member Author

justinsb commented May 7, 2019

Builds on #6885

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 7, 2019
Copy link
Contributor

@mikesplain mikesplain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a good solution/work around for me. Thanks @justinsb!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 7, 2019
@mikesplain mikesplain added cherry-pick and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels May 7, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb, 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:
  • OWNERS [justinsb,mikesplain]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mikesplain
Copy link
Contributor

/retest

1 similar comment
@mikesplain
Copy link
Contributor

/retest

@granular-ryanbonham
Copy link
Contributor

/test pull-kops-e2e-kubernetes-aws

@mikesplain
Copy link
Contributor

Not sure how I removed the lgtm but...
/lgtm

Thanks @justinsb!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 9, 2019
@k8s-ci-robot k8s-ci-robot merged commit d02f2a9 into kubernetes:master May 9, 2019
k8s-ci-robot added a commit that referenced this pull request May 9, 2019
…ck-of-#6893-upstream-release-1.12

Cherry pick of #6893 upstream release 1.12
k8s-ci-robot added a commit that referenced this pull request May 15, 2019
#6893-#6898-origin-release-1.13

Automated cherry pick of #6890: Fix machine types with klog #6893: /etc/hosts (gossip): Stronger logic #6898: Add i3en
k8s-ci-robot added a commit that referenced this pull request May 15, 2019
#6893-#6898-origin-release-1.14

Automated cherry pick of #6890: Fix machine types with klog #6893: /etc/hosts (gossip): Stronger logic #6898: Add i3en
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants