Remove always-nil error returns #36910
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
tklauser
added
kind/cleanup
tklauser
requested review from
ysksuzuki,
pippolo84,
rolinh,
giorio94,
rastislavs,
aanm,
mhofstetter and
Artyop
|
/test |
github-actions
bot
added
sig/policy
rolinh
approved these changes
Jan 9, 2025
Artyop
approved these changes
Jan 9, 2025
mhofstetter
reviewed
Jan 9, 2025
tklauser
force-pushed
the
pr/tklauser/always-nil-err
branch
from
a992790 to
d8aa0e3
Compare
|
/test |
These errors are always nil, so they can be omitted and get rid of the respective error checking code. Found using unparam. Note that we cannot enable the unparam linter yet in golangci-lint because there are some false positives. Signed-off-by: Tobias Klauser <tobias@cilium.io>
tklauser
force-pushed
the
pr/tklauser/always-nil-err
branch
from
d8aa0e3 to
7a193c6
Compare
|
Fixed up #36910 (comment) and a comment in Incremental diff: diff --git a/daemon/cmd/deletion_queue.go b/daemon/cmd/deletion_queue.go
index 3724b4a01e43..44687c98a053 100644
--- a/daemon/cmd/deletion_queue.go
+++ b/daemon/cmd/deletion_queue.go
@@ -44,7 +44,6 @@ func (dq *deletionQueue) Start(cell.HookContext) error {
}
if err := dq.lock(d.ctx); err != nil {
- log.WithError(err).Error("deletionQueue: lock failed")
return
}
@@ -77,8 +76,8 @@ func (dq *deletionQueue) lock(ctx context.Context) error {
return err
}
- // Don't a non-nil return error from here on so successive dq.processQueuedDeletes can still
- // continue with best effort.
+ // Don't return a non-nil error from here on so a successive call to dq.processQueuedDeletes
+ // can still continue with best effort.
var err error
dq.lf, err = lockfile.NewLockfile(defaults.DeleteQueueLockfile)
if err != nil { |
|
/test |
giorio94
approved these changes
Jan 9, 2025
rastislavs
approved these changes
Jan 9, 2025
aanm
requested changes
Jan 9, 2025
aanm
approved these changes
Jan 10, 2025
ysksuzuki
approved these changes
Jan 10, 2025
maintainer-s-little-helper
bot
added
the
ready-to-merge
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.
These errors are always nil, so they can be omitted and get rid of the respective error checking code. Found using
unparam. Note that we cannot enable theunparamlinter yet ingolangci-lintbecause there are some false positives.