You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pegasus.apache.org by yu...@apache.org on 2022/02/11 10:12:05 UTC
[incubator-pegasus] branch master updated: fix: shutdown error while closing replica (#909)
This is an automated email from the ASF dual-hosted git repository.
yuchenhe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new d43693b fix: shutdown error while closing replica (#909)
d43693b is described below
commit d43693b2bb22c0ef6182ec6e1e45c5e7117cd22b
Author: HeYuchen <he...@xiaomi.com>
AuthorDate: Fri Feb 11 18:11:58 2022 +0800
fix: shutdown error while closing replica (#909)
---
rdsn | 2 +-
src/server/pegasus_server_impl.cpp | 2 ++
src/server/pegasus_server_impl.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rdsn b/rdsn
index 2dd67e0..8c310b9 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit 2dd67e0885e36f964633c17afc7d91086517dfaf
+Subproject commit 8c310b95f8cf0a2123da5eed7e6621b6f94f30e0
diff --git a/src/server/pegasus_server_impl.cpp b/src/server/pegasus_server_impl.cpp
index d3d6b58..652d4e2 100644
--- a/src/server/pegasus_server_impl.cpp
+++ b/src/server/pegasus_server_impl.cpp
@@ -1636,6 +1636,8 @@ void pegasus_server_impl::cancel_background_work(bool wait)
flush_all_family_columns(true);
}
+ cancel_background_work(true);
+
// stop all tracked tasks when pegasus server is stopped.
if (_update_replica_rdb_stat != nullptr) {
_update_replica_rdb_stat->cancel(true);
diff --git a/src/server/pegasus_server_impl.h b/src/server/pegasus_server_impl.h
index c85e807..05de528 100644
--- a/src/server/pegasus_server_impl.h
+++ b/src/server/pegasus_server_impl.h
@@ -91,7 +91,7 @@ public:
// - ERR_LOCAL_APP_FAILURE
::dsn::error_code start(int argc, char **argv) override;
- void cancel_background_work(bool wait) override;
+ void cancel_background_work(bool wait);
// returns:
// - ERR_OK
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pegasus.apache.org
For additional commands, e-mail: commits-help@pegasus.apache.org