fix: Support OOMKilled with container-set. Fixes #10063
#11484
Conversation
Signed-off-by: Alex Collins <[email protected]>
|
Tagging @isubasinghe. Can you check this PR accounting for the expected changes you might push with your container set work? |
Signed-off-by: Alex Collins <[email protected]>
| @@ -70,24 +70,38 @@ func NewEmissaryCommand() *cobra.Command { | |||
| return fmt.Errorf("failed to unmarshal template: %w", err) | |||
| } | |||
|
|
|||
| // setup signal handlers | |||
| signals := make(chan os.Signal, 1) | |||
There was a problem hiding this comment.
Moved from lower in the file.
| @@ -7,6 +7,10 @@ import ( | |||
| "github.com/argoproj/argo-workflows/v3/util/errors" | |||
| ) | |||
|
|
|||
| var ( | |||
| Term = os.Interrupt | |||
There was a problem hiding this comment.
There is to os.Term because Windows does not have that. We fake it.
Signed-off-by: Alex Collins <[email protected]>
Signed-off-by: Alex Collins <[email protected]>
Signed-off-by: Alex Collins <[email protected]>
cmd/argoexec/commands/emissary.go
Outdated
| data, err := os.ReadFile(filepath.Clean(varRunArgo + "/ctr/" + y + "/exitcode")) | ||
| if os.IsNotExist(err) { | ||
| time.Sleep(time.Second) | ||
| continue | ||
| } | ||
| exitCode, err := strconv.Atoi(string(data)) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read exit-code of dependency %q: %w", y, err) | ||
| } | ||
| if exitCode != 0 { | ||
| return fmt.Errorf("dependency %q exited with non-zero code: %d", y, exitCode) |
|
Can you resolve conflicts? |
…rset-is-oom-killed Signed-off-by: Alex Collins <[email protected]>
terrytangyuan
deleted the
10063-pod-hangs-when-container-in-containerset-is-oom-killed
branch
|
@alexec Hi Alex! I'm not sure if you saw, but @terrytangyuan posted about difficulty merging this into the patch release branch. (see notes below from the cherry-pick release ticket) Are you able to look into this and submit a PR to the v3.4.11 release branch? Thanks again for pushing this fix! Since users had wanted it in 3.4.10, we wanted to see if it's possible to squeeze into 3.4.11.
|
Fixes #10063