This is an automated email from the ASF dual-hosted git repository. jiashuo pushed a commit to branch v2.1.1 in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
commit cb01029f9953291ef796278003b656182321137e Author: Jiashuo <[email protected]> AuthorDate: Mon Oct 26 12:19:34 2020 +0800 fix: perf callback dead-lock base #627 --- rdsn | 2 +- src/include/pegasus/version.h | 3 ++- src/server/config.ini | 7 ++++++- src/server/config.min.ini | 7 ++++++- src/server/test/config.ini | 7 ++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/rdsn b/rdsn index 0bd8f36..3f884f9 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit 0bd8f3685d99dbe4bfc0ee0f70776cb0a43e33aa +Subproject commit 3f884f935ed94805105ba56e5597c9a8f0679fab diff --git a/src/include/pegasus/version.h b/src/include/pegasus/version.h index c72d015..f31b6dd 100644 --- a/src/include/pegasus/version.h +++ b/src/include/pegasus/version.h @@ -18,4 +18,5 @@ */ #pragma once -#define PEGASUS_VERSION "2.1.0" + +#define PEGASUS_VERSION "2.1.1" diff --git a/src/server/config.ini b/src/server/config.ini index 9e93178..b4ec419 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -16,7 +16,7 @@ name = replica arguments = ports = 34801 - pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG + pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG,THREAD_POOL_PLOG run = true count = 1 @@ -152,6 +152,11 @@ name = slog worker_count = 1 +[threadpool.THREAD_POOL_PLOG] + name = plog + partitioned = true + worker_count = 4 + [meta_server] server_list = %{meta.server.list} cluster_root = /pegasus/%{cluster.name} diff --git a/src/server/config.min.ini b/src/server/config.min.ini index 73fe786..9a4d805 100644 --- a/src/server/config.min.ini +++ b/src/server/config.min.ini @@ -12,7 +12,7 @@ type = replica name = replica ports = @REPLICA_PORT@ - pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG + pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_INGESTION,THREAD_POOL_SLOG,THREAD_POOL_PLOG [apps.collector] name = collector @@ -93,6 +93,11 @@ name = slog worker_count = 1 +[threadpool.THREAD_POOL_PLOG] + name = plog + partitioned = true + worker_count = 4 + [meta_server] server_list = @LOCAL_IP@:34601,@LOCAL_IP@:34602,@LOCAL_IP@:34603 cluster_root = /pegasus/onebox/@LOCAL_IP@ diff --git a/src/server/test/config.ini b/src/server/test/config.ini index 5d8084e..4185601 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -10,7 +10,7 @@ type = replica name = replica arguments = ports = @REPLICA_PORT@ -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_SLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_LOCAL_SERVICE,THREAD_POOL_FDS_SERVICE,THREAD_POOL_COMPACT,THREAD_POOL_SLOG,THREAD_POOL_PLOG run = true count = 1 @@ -62,6 +62,11 @@ worker_count = 8 name = slog worker_count = 1 +[threadpool.THREAD_POOL_PLOG] + name = plog + partitioned = true + worker_count = 4 + [threadpool.THREAD_POOL_REPLICATION] name = replica partitioned = true --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
