Skip to content

[release/1.6] integration: regression test for issue 10589#10683

Merged
samuelkarp merged 2 commits intocontainerd:release/1.6from
samuelkarp:shim-exec-fp-test-1.6
Sep 6, 2024
Merged

[release/1.6] integration: regression test for issue 10589#10683
samuelkarp merged 2 commits intocontainerd:release/1.6from
samuelkarp:shim-exec-fp-test-1.6

Conversation

@samuelkarp
Copy link
Copy Markdown
Member

Manual cherry-pick of #10649

This issue was caused by a race between init exits and new exec process tracking inside the shim. The test operates by controlling the time between when the shim invokes "runc exec" and when the actual "runc exec" is triggered. This allows validating that races for shim state tracking between pre- and post-start of the exec process do not exist.

Relates to #10589

/cc @laurazard

Signed-off-by: Samuel Karp <[email protected]>
(cherry picked from commit 5f37a2c)
Signed-off-by: Samuel Karp <[email protected]>
Copy link
Copy Markdown
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

This issue was caused by a race between init exits and new exec process
tracking inside the shim. The test operates by controlling the time
between when the shim invokes "runc exec" and when the actual "runc
exec" is triggered. This allows validating that races for shim state
tracking between pre- and post-start of the exec process do not exist.

Relates to containerd#10589

Signed-off-by: Samuel Karp <[email protected]>
(cherry picked from commit 18725f0)
Signed-off-by: Samuel Karp <[email protected]>
@samuelkarp samuelkarp force-pushed the shim-exec-fp-test-1.6 branch from 23a07d1 to ab9fedd Compare September 6, 2024 21:02
if f := os.Getenv("RUNC_FLAVOR"); f != "" && f != "runc" {
t.Skip("test requires runc")
}
if rt := os.Getenv("TEST_RUNTIME"); rt != "" && rt != plugin.RuntimeRuncV2 {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@samuelkarp samuelkarp merged commit 172b137 into containerd:release/1.6 Sep 6, 2024
@samuelkarp samuelkarp deleted the shim-exec-fp-test-1.6 branch September 6, 2024 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants