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

[release/1.7] integration: regression test for issue 10589 #10682

Merged
merged 2 commits into from
Sep 6, 2024
Merged

[release/1.7] integration: regression test for issue 10589 #10682

merged 2 commits into from
Sep 6, 2024

Conversation

samuelkarp
Copy link
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 @corhere

@samuelkarp
fifosync: cross-process synchronization
1cc2cfa 
Signed-off-by: Samuel Karp <[email protected]>
(cherry picked from commit 5f37a2c)
Signed-off-by: Samuel Karp <[email protected]>
@k8s-ci-robot
Copy link

@samuelkarp: GitHub didn't allow me to request PR reviews from the following users: corhere.

Note that only containerd members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

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 @corhere

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@samuelkarp samuelkarp force-pushed the shim-exec-fp-test-1.7 branch from 0bc80f3 to fa5fbdd Compare September 6, 2024 19:48
dims
dims approved these changes Sep 6, 2024
View reviewed changes
Copy link
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

@cpuguy83
Copy link
Member

cpuguy83 commented Sep 6, 2024 

=== FAIL: . TestIssue10589 (0.02s)
    container_linux_test.go:1642: 1. Create a sleeping container
    log_hook.go:47: time="2024-09-06T19:58:38.898455231Z" level=debug msg="remote introspection plugin filters" func="introspection.(*introspectionRemote).Plugins" file="/home/runner/work/containerd/containerd/services/introspection/introspection.go:[46](https://github.com/containerd/containerd/actions/runs/10744346281/job/29801182839?pr=10682#step:12:47)" filters="[type==io.containerd.snapshotter.v1, id==overlayfs]" testcase=TestIssue10589
    container_linux_test.go:1666: 
        	Error Trace:	/home/runner/work/containerd/containerd/integration/client/container_linux_test.go:1666
        	Error:      	Received unexpected error:
        	            	invalid runtime options format: unknown
        	Test:       	TestIssue10589
        	Messages:   	create task

@samuelkarp
Copy link
Member Author

Yep, looks like I need to make sure the test only runs for io.containerd.runc.v2.

@samuelkarp
integration: regression test for issue 10589
0c4ba21 
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.7 branch from fa5fbdd to 0c4ba21 Compare September 6, 2024 21:02
@samuelkarp
Copy link
Member Author

@cpuguy83 Should be fixed; hopefully CI goes green now.

@samuelkarp
Copy link
Member Author

/retest

@samuelkarp
Copy link
Member Author

@cpuguy83 This is green now.

@samuelkarp samuelkarp merged commit c10e4a6 into containerd:release/1.7 Sep 6, 2024
57 checks passed
@samuelkarp samuelkarp deleted the shim-exec-fp-test-1.7 branch September 6, 2024 22:37
@samuelkarp samuelkarp mentioned this pull request Sep 6, 2024
Merged
@github-actions github-actions bot mentioned this pull request Sep 25, 2024
Open
@mikebrow mikebrow mentioned this pull request Jan 27, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dims dims dims approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@laurazard laurazard Awaiting requested review from laurazard

Assignees
No one assigned
Labels
area/runtime Runtime kind/bug size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@samuelkarp @k8s-ci-robot @cpuguy83 @dims