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.

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

Jump to bottom

Correct output when inspecting containers created with --ipc #17201

Merged
merged 1 commit into from
Jan 24, 2023
+30 −7
Merged

Correct output when inspecting containers created with --ipc #17201

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
14 changes: 10 additions & 4 deletions libpod/container_inspect_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,23 +183,29 @@ func (c *Container) platformInspectContainerHostConfig(ctrSpec *spec.Spec, hostC
// If there is none, it's ipc=host.
// If there is one and it has a path, it's "ns:".
// If no path, it's default - the empty string.
hostConfig.IpcMode = "host"
for _, ns := range ctrSpec.Linux.Namespaces {
if ns.Type == spec.IPCNamespace {
if ns.Path != "" {
hostConfig.IpcMode = fmt.Sprintf("ns:%s", ns.Path)
} else {
break
switch {
case c.config.NoShm:
hostConfig.IpcMode = "none"
case c.config.NoShmShare:
hostConfig.IpcMode = "private"
default:
hostConfig.IpcMode = "shareable"
}
}
break
}
}
case c.config.NoShm:
hostConfig.IpcMode = "none"
case c.config.NoShmShare:
hostConfig.IpcMode = "private"
}
if hostConfig.IpcMode == "" {
hostConfig.IpcMode = "shareable"
}
Copy link
Member

Choose a reason for hiding this comment

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

I prefer a switch to the if/elses in #17200, but I can't convince myself that this part of the change is equivalent. If a default case is possible, and none of the conditions trigger, won't IpcMode be left blank? (I don't know if this is possible)

Moving line 186 (initialization to "host") to line 177 (before the switch) would ease my mind, but perhaps it's obvious to those familiar with this code why that is not necessary.


// Cgroup namespace mode
cgroupMode := ""
Expand Down
23 changes: 20 additions & 3 deletions test/system/190-run-ipcns.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,20 @@ load helpers

@test "podman --ipc=host" {
hostipc="$(readlink /proc/self/ns/ipc)"
run_podman run --rm --ipc=host $IMAGE readlink /proc/self/ns/ipc
run_podman run --name IPC --ipc=host $IMAGE readlink /proc/self/ns/ipc
is "$output" "$hostipc" "HostIPC and container IPC should be same"
run_podman inspect IPC --format '{{ .HostConfig.IpcMode }}'
is "$output" "host" "host mode should be selected"
Copy link
Member

Choose a reason for hiding this comment

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

Just as a suggestion for future, not a blocker: I like my failure messages to make it clear why something is expected, not what is expected. (The "what" will be shown as part of the error message). Something like

    is "$output" "host" ".HostConfig.IpcMode when --ipc=host"

That makes the error message something like:

    FAIL: .HostConfig.IpcMode when --ipc=host
    expected: host
    got:      slaartibartfast

run_podman rm IPC
}

@test "podman --ipc=none" {
hostipc="$(readlink /proc/self/ns/ipc)"
run_podman run --rm --ipc=none $IMAGE readlink /proc/self/ns/ipc
run_podman run --ipc=none --name IPC $IMAGE readlink /proc/self/ns/ipc
assert "$output" != "$hostipc" "containeripc should != hostipc"
run_podman inspect IPC --format '{{ .HostConfig.IpcMode }}'
is "$output" "none" "none mode should be selected"
run_podman rm IPC

run_podman 1 run --rm --ipc=none $IMAGE ls /dev/shm
is "$output" "ls: /dev/shm: No such file or directory" "Should fail with missing /dev/shm"
Expand All @@ -25,6 +31,8 @@ load helpers
hostipc="$(readlink /proc/self/ns/ipc)"
run_podman run -d --ipc=private --name test $IMAGE sleep 100
assert "$output" != "$hostipc" "containeripc should != hostipc"
run_podman inspect test --format '{{ .HostConfig.IpcMode }}'
is "$output" "private" "private mode should be selected"

run_podman 125 run --ipc=container:test --rm $IMAGE readlink /proc/self/ns/ipc
is "$output" ".*is not allowed: non-shareable IPC (hint: use IpcMode:shareable for the donor container)" "Containers should not share private ipc namespace"
Expand All @@ -36,6 +44,8 @@ load helpers
hostipc="$(readlink /proc/self/ns/ipc)"
run_podman run -d --ipc=shareable --name test $IMAGE sleep 100
assert "$output" != "$hostipc" "containeripc(shareable) should != hostipc"
run_podman inspect test --format '{{ .HostConfig.IpcMode }}'
is "$output" "shareable" "shareable mode should be selected"

run_podman run --ipc=container:test --rm $IMAGE readlink /proc/self/ns/ipc
assert "$output" != "$hostipc" "containeripc(:test) should != hostipc"
Expand All @@ -47,12 +57,19 @@ load helpers
@test "podman --ipc=container@test" {
hostipc="$(readlink /proc/self/ns/ipc)"
run_podman run -d --name test $IMAGE sleep 100
containerid=$output
run_podman inspect test --format '{{ .HostConfig.IpcMode }}'
is "$output" "shareable" "shareable mode should be selected"
run_podman exec test readlink /proc/self/ns/ipc
assert "$output" != "$hostipc" "containeripc(exec) should != hostipc"

testipc=$output
run_podman run --ipc=container:test --rm $IMAGE readlink /proc/self/ns/ipc
run_podman run --name IPC --ipc=container:test $IMAGE readlink /proc/self/ns/ipc
assert "$output" = "$testipc" "Containers should share ipc namespace"
run_podman inspect IPC --format '{{ .HostConfig.IpcMode }}'
is "$output" "container:$containerid" "ipc mode should be selected"
run_podman rm IPC

run_podman stop -t 0 test
run_podman rm test
}
Expand Down