diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-09-03 03:24:28 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-09-03 03:24:28 +0000 |
| commit | e45819fcb4a96649a4030db7684f140d5ca46735 (patch) | |
| tree | 544dac3e30a0448eabdc50add41aa3a18982d9f1 /0115-bugfix-for-m_criService-shutdown.patch | |
| parent | 1a71e3afebb4b43be63949dcc8e882fe7643f13b (diff) | |
automatic import of iSuladopeneuler24.03_LTS
Diffstat (limited to '0115-bugfix-for-m_criService-shutdown.patch')
| -rw-r--r-- | 0115-bugfix-for-m_criService-shutdown.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/0115-bugfix-for-m_criService-shutdown.patch b/0115-bugfix-for-m_criService-shutdown.patch new file mode 100644 index 0000000..8d4d859 --- /dev/null +++ b/0115-bugfix-for-m_criService-shutdown.patch @@ -0,0 +1,33 @@ +From 93b1df1a1d3fcf6d285102f3cc1f79e6241aa393 Mon Sep 17 00:00:00 2001 +From: zhongtao <zhongtao17@huawei.com> +Date: Thu, 4 Jul 2024 10:58:38 +0800 +Subject: [PATCH 115/121] bugfix for m_criService shutdown + +Signed-off-by: zhongtao <zhongtao17@huawei.com> +--- + src/daemon/entry/connect/grpc/grpc_service.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/daemon/entry/connect/grpc/grpc_service.cc b/src/daemon/entry/connect/grpc/grpc_service.cc +index 300af082..fb5ec3cb 100644 +--- a/src/daemon/entry/connect/grpc/grpc_service.cc ++++ b/src/daemon/entry/connect/grpc/grpc_service.cc +@@ -111,12 +111,12 @@ public: + void Shutdown(void) + { + // call CRI to shutdown stream server, shutdown cri first to notify events thread to exit ++ m_criService.Shutdown(); ++ + if (m_server != nullptr) { + m_server->Shutdown(); + } +- +- m_server->Shutdown(); +- ++ + // Shutdown daemon, this operation should remove socket file. + for (const auto &address : m_socketPath) { + if (address.find(UNIX_SOCKET_PREFIX) == 0) { +-- +2.25.1 + |