octopus: cephadm: run containers using --init
#39914
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
adopt command allows for the `--container-init` flag Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit d89fae5)
generally all ceph containers need an init process to both reap any zombie pids and/or perform signal handling (e.g. coredumps, etc.) Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit 9ac2ab8)
allow for the `--init` flag to be passed during `cephadm shell` Signed-off-by: Michael Fritch <mfritch@suse.com> (cherry picked from commit 5750589)
3 tasks
If we are in a container, then we do not have a unique pid, and need to use a random nonce. We normally detect this if our pid is 1, but that doesn't work when we have a init process--we'll (probably?) have a small pid (in my tests, the OSDs were getting pid 7). To be safe, also check for an environment variable set by cephadm. This avoids problems that arise when we don't have a unique address. Fixes: https://tracker.ceph.com/issues/49534 Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit d18f608)
This ensures that daemon messenger nonces don't collide by using PIDs that are no longer unique for the IP address. Signed-off-by: Sage Weil <sage@newdream.net> (cherry picked from commit 576823b)
octopus supports podman < 2.0 which does not have the `--init` flag Signed-off-by: Michael Fritch <mfritch@suse.com>
mgfritch
force-pushed
the
octopus-backport-37764-39739
branch
from
a39eae1
to
82d30af
Compare
mgfritch
changed the title
--init by default--init
3 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.
backport of #37764 and #39739
Fixes: https://tracker.ceph.com/issues/49223
Signed-off-by: Michael Fritch mfritch@suse.com
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox