github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7951 from Iceber/fix_restart_monitor

Browse Source
This commit is contained in:
Fu Wei
2023-03-16 08:58:20 +08:00
committed by GitHub
parent f558a3d598 76778aee64
commit e735405c15
2 changed files with 88 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/restart/monitor/monitor.go
View File

@@ -171,9 +171,15 @@ func (m *monitor) monitor(ctx context.Context) ([]change, error) {
// which will result in an `on-failure` restart policy reconcile error.
switch desiredStatus {
case containerd.Running:
switch status.Status {
case containerd.Paused, containerd.Pausing:
continue
default:
}
if !restart.Reconcile(status, labels) {
continue
}
restartCount, _ := strconv.Atoi(labels[restart.CountLabel])
if labels["containerd.io/restart.logpath"] != "" {
logrus.Warn(`Label "containerd.io/restart.logpath" is no longer supported since containerd v2.0. Use "containerd.io/restart.loguri" instead.`)