Enhance hooks tracker by adding an returned error to record function #7153
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
allenxu404
force-pushed
the
hooktracker-update
branch
from
025dac7 to
0a7ea3a
Compare
allenxu404
changed the title
allenxu404
force-pushed
the
hooktracker-update
branch
from
0a7ea3a to
fff3503
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #7153 +/- ##
========================================
Coverage 61.77% 61.78%
========================================
Files 259 261 +2
Lines 27859 27994 +135
========================================
+ Hits 17210 17295 +85
- Misses 9445 9479 +34
- Partials 1204 1220 +16 ☔ View full report in Codecov by Sentry. |
allenxu404
force-pushed
the
hooktracker-update
branch
2 times, most recently
from
d570df4 to
68d4e7d
Compare
reasonerjt
reviewed
Dec 5, 2023
| @@ -166,7 +166,11 @@ func (e *DefaultWaitExecHookHandler) HandleHooks( | |||
| err := fmt.Errorf("hook %s in container %s expired before executing", hook.HookName, hook.Hook.Container) | |||
| hookLog.Error(err) | |||
| errors = append(errors, err) | |||
| hookTracker.Record(newPod.Namespace, newPod.Name, hook.Hook.Container, hook.HookSource, hook.HookName, hookPhase(""), true) | |||
|
|
|||
| trackerErr := hookTracker.Record(newPod.Namespace, newPod.Name, hook.Hook.Container, hook.HookSource, hook.HookName, hookPhase(""), true) | |||
There was a problem hiding this comment.
Any reason you are ignoring the errors returned by Record in internal/hook/item_hook_handler.go
but handling the errors in this file?
There was a problem hiding this comment.
The Record error was ignored in internal/hook/item_hook_handler.go just for simplicity, which I consider might not be a good behavior.
Will change it.
internal/hook/item_hook_handler.go
Outdated
| hookTracker.Record(namespace, name, hookFromAnnotations.Container, HookSourceAnnotation, "", phase, false) | ||
| if err := h.PodCommandExecutor.ExecutePodCommand(hookLog, obj.UnstructuredContent(), namespace, name, "<from-annotation>", hookFromAnnotations); err != nil { | ||
| hookFailed := false | ||
| if err = h.PodCommandExecutor.ExecutePodCommand(hookLog, obj.UnstructuredContent(), namespace, name, "<from-annotation>", hookFromAnnotations); err != nil { |
There was a problem hiding this comment.
trivial: it'd be better to limit the scope of the var err to the if clause and use hookFailed in line 242
There was a problem hiding this comment.
Sure, let me make it more clear.
allenxu404
force-pushed
the
hooktracker-update
branch
from
68d4e7d to
be9e3fd
Compare
Signed-off-by: allenxu404 <qix2@vmware.com>
allenxu404
force-pushed
the
hooktracker-update
branch
from
be9e3fd to
6051b3c
Compare
reasonerjt
approved these changes
Dec 5, 2023
blackpiglet
approved these changes
Dec 5, 2023
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.
Thank you for contributing to Velero!
Please add a summary of your change
Does your change fix a particular issue?
Please indicate you've done the following:
/kind changelog-not-requiredas a comment on this pull request.site/content/docs/main.