[1.6] Fix issue where lxc_config.h header disappears after some regenerations #10640
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
[ upstream commit 83cad91 ] Semantically these are similar, but the new name is less specific to compilation, allowing an upcoming patch to also switch on whether to reuse existing state dir files based upon whether the headerfiles were regenerated. No functional changes in this patch. Signed-off-by: Joe Stringer <joe@cilium.io>
[ upstream commit dbec3fd ] [ Backporter's notes: Minor fixes necessary for additional error cases on the older branch. Treat those error cases as not changing the headerfiles on the filesystem. ] In certain circumstances, it was possible for the endpoint lxc_config.h headerfile to disappear if the endpoint was regenerated twice. In some circumstances this could be mitigated by the presence of FQDN policy which would recreate the file, but if the daemon was killed promptly before the endpoint controller for storing FQDN state runs, or if the user manually regenerates the endpoint multiple times, then the file could be missing. If you combine this with an agent restart, this may cause Cilium to forget about managing an endpoint which it previously managed, potentially leading later to connectivity issues when Cilium fails to push policy entries for this endpoint to allow traffic to flow. This patch fixes the issue by ensuring that if the headerfile is not recreated during the regeneration process, the old one is moved on the filesystem from the existing path into the new state dir path. Fixes: 6778d02 ("endpoint: Only rewrite headerfile when ep changes") Fixes: #10337 Fixes: #10603 Signed-off-by: Joe Stringer <joe@cilium.io>
|
never-tell-me-the-odds |
jrajahalme
approved these changes
Mar 19, 2020
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.
Once this PR is merged, you can update the PR labels via: