Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[1.20] Revert "Set systemd property KillMode to mixed for containers" #4547

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Feb 8, 2021
+2 −15
Merged

[1.20] Revert "Set systemd property KillMode to mixed for containers" #4547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions pkg/container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,6 @@ func (c *container) SpecAddAnnotations(sb *sandbox.Sandbox, containerVolumes []o
if systemdHasCollectMode {
c.spec.AddAnnotation("org.systemd.property.CollectMode", "'inactive-or-failed'")
}
// Set systemd killmode to mixed so that only the main container process gets the SIGTERM
// This prevents issues with double signals to child processes inside the container
// when the main process propagates the signals down.
c.spec.AddAnnotation("org.systemd.property.KillMode", "'mixed'")
}

if configStopSignal != "" {
Expand Down
13 changes: 2 additions & 11 deletions server/sandbox_run_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,17 +622,8 @@ func (s *Server) runPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
g.AddAnnotation("org.opencontainers.image.stopSignal", podContainer.Config.Config.StopSignal)
}

if s.config.CgroupManager().IsSystemd() {
if node.SystemdHasCollectMode() {
g.AddAnnotation("org.systemd.property.CollectMode", "'inactive-or-failed'")
}

// Set systemd killmode to mixed so that only the main container process gets the SIGTERM
// This prevents issues with double signals to child processes inside the container
// when the main process propagates the signals down.
if s.config.CgroupManager().IsSystemd() {
g.AddAnnotation("org.systemd.property.KillMode", "'mixed'")
}
if s.config.CgroupManager().IsSystemd() && node.SystemdHasCollectMode() {
g.AddAnnotation("org.systemd.property.CollectMode", "'inactive-or-failed'")
}

created := time.Now()
Expand Down