supportbundle: fix nil pointer error #2598
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
Codecov Report
@@ Coverage Diff @@
## main #2598 +/- ##
==========================================
+ Coverage 60.27% 60.62% +0.34%
==========================================
Files 282 285 +3
Lines 22345 23050 +705
==========================================
+ Hits 13469 13973 +504
- Misses 7452 7610 +158
- Partials 1424 1467 +43
Flags with carried forward coverage won't be shown. Click here to find out more.
|
antoninbas
reviewed
Aug 16, 2021
Comment on lines
162
to
164
| if b != nil { | ||
| r.clean(ctx, b.Filepath, bundleExpireDuration) | ||
| } |
There was a problem hiding this comment.
shouldn't we check the value of err after calling collectAgent / collectController above?
There was a problem hiding this comment.
thanks, I moved it into the annomous function which wraps to handle error returned from collectAgent / collectController
func() {
r.statusLocker.Lock()
defer r.statusLocker.Unlock()
if err != nil {
klog.Errorf("Error when collecting supportBundle: %v", err)
r.cache.Status = systemv1beta1.SupportBundleStatusNone
return
}
...
}()
liu4480
force-pushed
the
nil-pointer-in-supportbundle
branch
from
7b32019
to
9f91972
Compare
antoninbas
previously approved these changes
Aug 20, 2021
|
/test-all |
tnqn
approved these changes
Aug 23, 2021
tnqn
requested changes
Aug 23, 2021
when iproute2 is not installed in docker image, and run `antctl supportbundle` in antrea-agent, it will panic, this is because, collectAgent will return a nil pointer for systemv1beta1.SupportBundle, and in `func (r *supportBundleREST) Create`, antrea handles the nil pointer directly which leads to the panic. Signed-off-by: Bin Liu <biliu@vmware.com>
liu4480
force-pushed
the
nil-pointer-in-supportbundle
branch
from
9f91972
to
3a5402c
Compare
|
/test-all |
tnqn
approved these changes
Aug 23, 2021
antoninbas
approved these changes
Aug 23, 2021
liu4480
added a commit
to liu4480/antrea
that referenced
this pull request
Sep 16, 2021
When iproute2 is not installed in docker image, and one runs `antctl supportbundle` in antrea-agent, it will panic. This is because collectAgent will return a nil pointer for systemv1beta1.SupportBundle, and in `func (r *supportBundleREST) Create`, antrea calls a method on the nil pointer directly which leads to the panic. Signed-off-by: Bin Liu <biliu@vmware.com>
tnqn
added a commit
to tnqn/antrea
that referenced
this pull request
Oct 17, 2022
The code should only schedule file cleanup when the returned error is empty (meaning the returned supportbundle is not nil), otherwise the supportbundle file would never be deleted and the program would panic when there is any error encountered during supportbundle collection. antrea-io#2598 tried to fix it but did the opposite. Signed-off-by: Quan Tian <qtian@vmware.com>
tnqn
added a commit
to tnqn/antrea
that referenced
this pull request
Oct 19, 2022
The code should only schedule file cleanup when the returned error is empty (meaning the returned supportbundle is not nil), otherwise the supportbundle file would never be deleted and the program would panic when there is any error encountered during supportbundle collection. antrea-io#2598 tried to fix it but did the opposite. Signed-off-by: Quan Tian <qtian@vmware.com>
tnqn
added a commit
to tnqn/antrea
that referenced
this pull request
Oct 20, 2022
The code should only schedule file cleanup when the returned error is empty (meaning the returned supportbundle is not nil), otherwise the supportbundle file would never be deleted and the program would panic when there is any error encountered during supportbundle collection. antrea-io#2598 tried to fix it but did the opposite. Signed-off-by: Quan Tian <qtian@vmware.com>
tnqn
added a commit
that referenced
this pull request
Oct 20, 2022
The code should only schedule file cleanup when the returned error is empty (meaning the returned supportbundle is not nil), otherwise the supportbundle file would never be deleted and the program would panic when there is any error encountered during supportbundle collection. #2598 tried to fix it but did the opposite. Signed-off-by: Quan Tian <qtian@vmware.com>
hongliangl
pushed a commit
to hongliangl/antrea
that referenced
this pull request
Oct 22, 2022
…ea-io#4306) The code should only schedule file cleanup when the returned error is empty (meaning the returned supportbundle is not nil), otherwise the supportbundle file would never be deleted and the program would panic when there is any error encountered during supportbundle collection. antrea-io#2598 tried to fix it but did the opposite. Signed-off-by: Quan Tian <qtian@vmware.com>
heanlan
pushed a commit
to heanlan/antrea
that referenced
this pull request
Mar 29, 2023
…ea-io#4306) The code should only schedule file cleanup when the returned error is empty (meaning the returned supportbundle is not nil), otherwise the supportbundle file would never be deleted and the program would panic when there is any error encountered during supportbundle collection. antrea-io#2598 tried to fix it but did the opposite. Signed-off-by: Quan Tian <qtian@vmware.com>
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.
when iproute2 is not installed in docker image, and run
antctl supportbundleinantrea-agent, it will panic, this is because, collectAgent will return a nil pointer
for systemv1beta1.SupportBundle, and
func (r *supportBundleREST) Create,antrea handles the nil pointer directly which leads to the panic.