fix: Better message formating for nodes #5160
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Simon Behar <simbeh7@gmail.com>
alexec
approved these changes
Feb 22, 2021
workflow/controller/operator.go
Outdated
| @@ -1320,7 +1328,7 @@ func inferFailedReason(pod *apiv1.Pod) (wfv1.NodePhase, string) { | |||
| // executor is expected to annotate a message to the pod upon any errors. | |||
| // If we failed to see the annotated message, it is likely the pod ran with | |||
| // insufficient privileges. Give a hint to that effect. | |||
| return wfv1.NodeError, fmt.Sprintf("%s; verify serviceaccount %s:%s has necessary privileges", msg, pod.Namespace, pod.Spec.ServiceAccountName) | |||
| return wfv1.NodeError, fmt.Sprintf("%s%s verify serviceaccount %s:%s has necessary privileges", msg, splitChar, pod.Namespace, pod.Spec.ServiceAccountName) | |||
There was a problem hiding this comment.
in the case of 403 errors, the error message as actually enough to point out the problem, so I think we should just return msg here
workflow/controller/operator.go
Outdated
| splitChar = "," | ||
| } | ||
| if annotatedMsg != "" && annotatedMsg != t.Message { | ||
| msg = fmt.Sprintf("%s%s %s", msg, splitChar, annotatedMsg) |
There was a problem hiding this comment.
I think we should get rid of annotatedMsg completely - because ContainerStatus.Message is usually the same thing, but not for this PR.
| @@ -1309,7 +1309,15 @@ func inferFailedReason(pod *apiv1.Pod) (wfv1.NodePhase, string) { | |||
| continue | |||
| } | |||
|
|
|||
| msg := fmt.Sprintf("exit code %d: %s; %s; %s", t.ExitCode, t.Reason, t.Message, annotatedMsg) | |||
| msg := fmt.Sprintf("%s (exit code %d)", t.Reason, t.ExitCode) | |||
There was a problem hiding this comment.
I agree - this is easier to read
|
@simster7 just a thought - do you want to pull the changes that remove |
Signed-off-by: Simon Behar <simbeh7@gmail.com>
Done |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before:
After: