fix nil pointer panic for monitor #6830
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
dmcgowan
reviewed
Apr 20, 2022
runtime/restart/monitor/monitor.go
Outdated
| @@ -220,11 +220,13 @@ func (m *monitor) monitor(ctx context.Context) ([]change, error) { | |||
| } | |||
| desiredStatus := containerd.ProcessStatus(labels[restart.StatusLabel]) | |||
| task, err := c.Task(ctx, nil) | |||
| if err != nil && desiredStatus == containerd.Stopped { | |||
| if err != nil { | |||
There was a problem hiding this comment.
This changes the logic some, is there a case this was trying to account for when Task may return not found and the switch statement will handle it when desired state is running?
There was a problem hiding this comment.
For the case when Task returns not found and the restart desired to stop, maybe we need to continue to stop the container.
I change the logic to be the same as before .
|
Build succeeded.
|
samuelkarp
requested changes
Apr 20, 2022
runtime/restart/monitor/monitor.go
Outdated
| if err != nil { | ||
| logrus.WithError(err).Error("monitor") | ||
| if desiredStatus == containerd.Stopped { | ||
| goto desiredSwitch |
There was a problem hiding this comment.
Let's see if we can avoid goto and rewrite the logic a bit more clearly.
var status containerd.Status
if task, err := c.Task(ctx, nil); err == nil {
status, err = task.Status(ctx)
if err == nil {
if desiredStatus == status.Stopped {
continue
}
} else {
logrus.WithError(err).Error("monitor")
if desiredStatus == containerd.Stopped {
continue
}
}
} else {
logrus.WithError(err).Error("monitor")
if desiredStatus == containerd.Stopped {
continue
}
}This allows error cases where desiredStatus is equal to containerd.Running to fall through to the switch statement while avoiding the scope clarity issues with goto.
There was a problem hiding this comment.
How about this:
var (
task containerd.Task
status containerd.Status
err error
)
if task, err = c.Task(ctx, nil); err == nil {
if status, err = task.Status(ctx); err == nil {
if desiredStatus == status.Status {
continue
}
}
}
// Task or Status return error, only desired to stop
if err != nil {
logrus.WithError(err).Error("monitor")
if desiredStatus != containerd.Stopped {
continue
}
}
Signed-off-by: Ye Sijun <[email protected]>
|
Build succeeded.
|
AkihiroSuda
approved these changes
Apr 20, 2022
fuweid
approved these changes
Apr 20, 2022
|
Seems still broken https://github.com/containerd/nerdctl/runs/6091620240?check_suite_focus=true |
junnplus
pushed a commit
to junnplus/containerd
that referenced
this pull request
Apr 20, 2022
Signed-off-by: Ye Sijun <[email protected]>
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.
Signed-off-by: Ye Sijun [email protected]
build main and run containerd failed.