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): Deal with the pod watch API call timing out #4734

Merged
merged 3 commits into from Dec 14, 2020
Merged

fix(executor): Deal with the pod watch API call timing out #4734

merged 3 commits into from Dec 14, 2020

Conversation

hermanhobnob
Copy link
Contributor

@hermanhobnob hermanhobnob commented Dec 14, 2020

Checklist:

Tested manually by adding a couple of lines to reduce the api timeout to ~20 seconds and then running a tweaked hello-world workflow with a sleep 60. Ideally this would be an e2e test, but in your youtube contributor video you mentioned needing all the e2e tests to run in under 10 minutes. I'm not sure how much you could compress the times and still have a reliable test for this, so I haven't added an end to end test. Opinions welcome.

@CLAassistant
Copy link

CLAassistant commented Dec 14, 2020

CLA assistant check
All committers have signed the CLA.

@hermanhobnob hermanhobnob changed the title Deal with the pod watch API call timing out fix: Deal with the pod watch API call timing out Dec 14, 2020
Signed-off-by: Paul Hirst <github@bearandgiraffe.org>
@alexec alexec changed the title fix: Deal with the pod watch API call timing out fix(executor): Deal with the pod watch API call timing out Dec 14, 2020
@@ -26,22 +26,32 @@ func UntilTerminated(kubernetesInterface kubernetes.Interface, namespace, podNam
}

func untilTerminatedAux(podInterface v1.PodInterface, containerID string, listOptions metav1.ListOptions) (bool, error) {
for {
complete, done, err := doWatch(podInterface, containerID, listOptions)
Copy link
Contributor

Choose a reason for hiding this comment

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

In English, "complete" means the same thing as "done". Is there a better name to use?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Very fair point. I couldn't think of a better synonym, so I went for something more explicit and swapped the booleans around to match.

Signed-off-by: Paul Hirst <github@bearandgiraffe.org>
@alexec
Copy link
Contributor

alexec commented Dec 14, 2020

LGTM

@hermanhobnob
Copy link
Contributor Author

@alexec , is there anything more I need to do with this PR or will you just merge it at some point, when appropriate?

@alexec
Copy link
Contributor

alexec commented Dec 14, 2020

@simster7 this needs to be back-ported to v2.12. Would it be best if we label issues that need backporting? @sarabala1979 ?

@simster7
Copy link
Member

Sure, I am about to make an issue with all the commits since the previous release and was hoping to have you all checkbox which ones you wanted in the release

@alexec
Copy link
Contributor

alexec commented Dec 14, 2020

ok, lets do your idea @simster7

@alexec alexec closed this Dec 14, 2020
@alexec alexec reopened this Dec 14, 2020
@simster7
Copy link
Member

Let's get this merged in

@alexec alexec merged commit 1f421df into argoproj:master Dec 14, 2020
@simster7 simster7 mentioned this pull request Dec 15, 2020
22 tasks
simster7 pushed a commit that referenced this pull request Dec 15, 2020
Signed-off-by: Paul Hirst <github@bearandgiraffe.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants