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.

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

fix(executor): Fix docker not terminating. Fixes #6064 #6083

Merged
merged 7 commits into from
Jun 9, 2021
Merged

Conversation

alexec
Copy link
Contributor

@alexec alexec commented Jun 3, 2021

Signed-off-by: Alex Collins alex_collins@intuit.com
Fixes #6064

Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
@codecov
Copy link

codecov bot commented Jun 3, 2021

Codecov Report

Merging #6083 (c3c6411) into master (1d76c48) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6083      +/-   ##
==========================================
+ Coverage   47.73%   47.75%   +0.01%     
==========================================
  Files         249      249              
  Lines       15740    15740              
==========================================
+ Hits         7514     7516       +2     
+ Misses       7285     7284       -1     
+ Partials      941      940       -1     
Impacted Files Coverage Δ
cmd/argoexec/commands/emissary.go 50.00% <0.00%> (+1.56%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1d76c48...c3c6411. Read the comment docs.

@alexec alexec marked this pull request as ready for review June 3, 2021 22:55
@alexec alexec added this to the v3.0 milestone Jun 3, 2021
@alexec alexec enabled auto-merge (squash) June 3, 2021 22:55
@alexec
Copy link
Contributor Author

alexec commented Jun 3, 2021

@sarabala1979 can you please review? This is for v3.0 backport.

@alexec
Copy link
Contributor Author

alexec commented Jun 3, 2021

Oh - why no test is this? The test that should have failed is in #6084. Hde test-executor job fails for docker, but there are no docker changes in that PR. Once this PR is merged, I will sync that PR with master, and test will pass.

alexec and others added 3 commits June 5, 2021 15:16
@alexec
Copy link
Contributor Author

alexec commented Jun 8, 2021

@whynowy can you please review?

@@ -207,55 +213,69 @@ func (d *DockerExecutor) Wait(ctx context.Context, containerNames []string) erro
return err
}

func (d *DockerExecutor) listContainers() (map[string]ctr, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

lift-and-shift

Copy link
Member

@whynowy whynowy left a comment

Choose a reason for hiding this comment

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

I assume it has been well tested.

@alexec alexec merged commit a497e82 into master Jun 9, 2021
@alexec alexec deleted the dev-docker branch June 9, 2021 22:15
@fire
Copy link

fire commented Jun 9, 2021

Do you know if this is a bug fix for my hang?

https://github.com/V-Sekai/workflow-maroon-steel-cat/blob/main/.github/workflows/workflow-maroon-steel-cat.yml

The logs looks similar but I can't tell.

@alexec alexec mentioned this pull request Jun 10, 2021
20 tasks
@sarabala1979 sarabala1979 mentioned this pull request Jun 10, 2021
88 tasks
alexec added a commit that referenced this pull request Jun 10, 2021
Signed-off-by: Alex Collins <alex_collins@intuit.com>
@alexec alexec mentioned this pull request Jun 21, 2021
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants