Clean up old daemon cgroups #1595
Merged
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
narrieta
requested changes
Jul 30, 2019
| @@ -69,6 +69,7 @@ def run(self, child_args=None): | |||
| self.initialize_environment() | |||
|
|
|||
| CGroupConfigurator.get_instance().create_agent_cgroups(track_cgroups=False) | |||
| CGroupConfigurator.get_instance().cleanup_old_cgroups() | |||
There was a problem hiding this comment.
since the cleanup is just temporary we should move the logic to create_agent_cgroups instead of calling a separate function
There was a problem hiding this comment.
I'm in favour of keeping it separate to maintain one responsibility per function and to make the testing easier. The removal logic stays the same wherever the call happens.
|
|
||
| contents = fileutil.read_file(os.path.join(old_path, "cgroup.procs")) | ||
|
|
||
| if daemon_pid in contents: |
There was a problem hiding this comment.
I would keep it to make sure that we're only writing the daemon PID if it's not already there (by explicitly checking it's still in the old cgroup).
narrieta
approved these changes
Jul 30, 2019
6 tasks
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
Daemons from version 2.2.31 to 2.2.40 added their PID to a now-obsolete cgroup
WALinuxAgent/WALinuxAgent. Add logic to move that PID to the new cgroup,walinuxagent.servicefor each controller to ensure we track both the daemon and extension handler process.PR information
Quality of Code and Contribution Guidelines
This change is