docker: 'delete event' is not need to process in daemon processEvent

Signed-off-by: liuzekun <liuzekun@huawei.com>
This commit is contained in:
liuzekun 2020-04-10 10:57:49 +08:00
parent 0777be28b5
commit 9f71f40e9f
4 changed files with 30 additions and 2 deletions

View File

@ -1 +1 @@
18.09.0.102
18.09.0.103

View File

@ -1,6 +1,6 @@
Name: docker-engine
Version: 18.09.0
Release: 102
Release: 103
Summary: The open-source application container engine
Group: Tools/Docker

View File

@ -0,0 +1,27 @@
From 0fe29ca9d45ddcb36f009a8da5f858f49a8e2844 Mon Sep 17 00:00:00 2001
From: liuzekun <liuzekun@huawei.com>
Date: Wed, 8 Apr 2020 17:32:03 +0800
Subject: [PATCH] docker: delete event is not need to access processEvent
reason: delete event is not need to access processEvent, continue it
Signed-off-by: liuzekun <liuzekun@huawei.com>
---
components/engine/libcontainerd/client_daemon.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/components/engine/libcontainerd/client_daemon.go b/components/engine/libcontainerd/client_daemon.go
index 858d6429..05c439c5 100755
--- a/components/engine/libcontainerd/client_daemon.go
+++ b/components/engine/libcontainerd/client_daemon.go
@@ -895,6 +895,7 @@ func (c *client) processEventStream(ctx context.Context, ns string) {
"ExitStatus": t.ExitStatus,
"ExitedAt": t.ExitedAt,
}).Infof("event")
+ continue
default:
c.logger.WithFields(logrus.Fields{
"topic": ev.Topic,
--
2.19.1

View File

@ -157,3 +157,4 @@ patch/0158-docker-support-private-registry.patch
patch/0159-docker-extend-timeout-in-cli-testcases.patch
patch/0160-docker-create-a-soft-link-from-runtime-default-to-ru.patch
patch/0161-docker-Delete-stale-containerd-object-on-start-f.patch
patch/0162-docker-delete-event-is-not-need-to-process.patch