From 45c40a4d9c222f796a30fcee3acd16998078d973 Mon Sep 17 00:00:00 2001 From: liuzekun Date: Fri, 10 Apr 2020 10:57:49 +0800 Subject: [PATCH] docker: 'delete event' is not need to process in daemon processEvent Signed-off-by: liuzekun --- VERSION-openeuler | 2 +- docker-engine-openeuler.spec | 2 +- ...-delete-event-is-not-need-to-process.patch | 27 +++++++++++++++++++ series.conf | 1 + 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 patch/0162-docker-delete-event-is-not-need-to-process.patch diff --git a/VERSION-openeuler b/VERSION-openeuler index 9ce0e89..fa1cead 100644 --- a/VERSION-openeuler +++ b/VERSION-openeuler @@ -1 +1 @@ -18.09.0.102 +18.09.0.103 diff --git a/docker-engine-openeuler.spec b/docker-engine-openeuler.spec index cb4eaec..9098317 100644 --- a/docker-engine-openeuler.spec +++ b/docker-engine-openeuler.spec @@ -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 diff --git a/patch/0162-docker-delete-event-is-not-need-to-process.patch b/patch/0162-docker-delete-event-is-not-need-to-process.patch new file mode 100644 index 0000000..fef6e36 --- /dev/null +++ b/patch/0162-docker-delete-event-is-not-need-to-process.patch @@ -0,0 +1,27 @@ +From 0fe29ca9d45ddcb36f009a8da5f858f49a8e2844 Mon Sep 17 00:00:00 2001 +From: liuzekun +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 +--- + 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 + diff --git a/series.conf b/series.conf index dc86577..d8ce86d 100644 --- a/series.conf +++ b/series.conf @@ -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 -- Gitee