From 7a396b360aa69ecc482d4805189bdaa998a0ad02 Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Wed, 25 Sep 2024 21:05:43 +0800 Subject: [PATCH 1/8] fix(learn) avoid learn use DEFAULT_POOL FLAGS_max_copy_rate_megabytes_per_disk will use `sleep_for` function to block THREAD_POOL_DEFAULT. It's cause replica server cannot deal `remote command`. This modify is same as FLAGS_max_send_rate_megabytes_per_disk, only use THREAD_POOL_BLOCK_SERVICE to sleep. relate issue:https://github.com/apache/incubator-pegasus/issues/1969 --- src/block_service/block_service.h | 2 -- src/nfs/nfs_code_definition.h | 12 ++++++------ src/utils/threadpool_code.h | 1 + 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/block_service/block_service.h b/src/block_service/block_service.h index aa6b4b26cb..c90887fc96 100644 --- a/src/block_service/block_service.h +++ b/src/block_service/block_service.h @@ -43,8 +43,6 @@ namespace dsn { namespace dist { namespace block_service { -DEFINE_THREAD_POOL_CODE(THREAD_POOL_BLOCK_SERVICE) - class block_file; typedef dsn::ref_ptr block_file_ptr; diff --git a/src/nfs/nfs_code_definition.h b/src/nfs/nfs_code_definition.h index a848cf9028..9b94219e59 100644 --- a/src/nfs/nfs_code_definition.h +++ b/src/nfs/nfs_code_definition.h @@ -29,16 +29,16 @@ namespace dsn { namespace service { // define RPC task code for service 'nfs' -DEFINE_TASK_CODE_RPC(RPC_NFS_COPY, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT) -DEFINE_TASK_CODE_RPC(RPC_NFS_GET_FILE_SIZE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT) +DEFINE_TASK_CODE_RPC(RPC_NFS_COPY, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) +DEFINE_TASK_CODE_RPC(RPC_NFS_GET_FILE_SIZE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) // test timer task code DEFINE_TASK_CODE(LPC_NFS_REQUEST_TIMER, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT) -DEFINE_TASK_CODE_AIO(LPC_NFS_READ, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT) -DEFINE_TASK_CODE(LPC_NFS_FILE_CLOSE_TIMER, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT) +DEFINE_TASK_CODE_AIO(LPC_NFS_READ, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) +DEFINE_TASK_CODE(LPC_NFS_FILE_CLOSE_TIMER, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT) -DEFINE_TASK_CODE_AIO(LPC_NFS_WRITE, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT) +DEFINE_TASK_CODE_AIO(LPC_NFS_WRITE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) -DEFINE_TASK_CODE_AIO(LPC_NFS_COPY_FILE, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT) +DEFINE_TASK_CODE_AIO(LPC_NFS_COPY_FILE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) } // namespace service } // namespace dsn diff --git a/src/utils/threadpool_code.h b/src/utils/threadpool_code.h index cd3eac2db7..8edac24b2e 100644 --- a/src/utils/threadpool_code.h +++ b/src/utils/threadpool_code.h @@ -66,6 +66,7 @@ class threadpool_code DEFINE_THREAD_POOL_CODE(THREAD_POOL_INVALID) DEFINE_THREAD_POOL_CODE(THREAD_POOL_DEFAULT) +DEFINE_THREAD_POOL_CODE(THREAD_POOL_BLOCK_SERVICE) } // namespace dsn USER_DEFINED_STRUCTURE_FORMATTER(::dsn::threadpool_code); From 5f338df37d5c4c4d460d7cddf06bbde838a05a78 Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Tue, 29 Oct 2024 15:42:31 +0800 Subject: [PATCH 2/8] follow iwyu and clang-tidy advice --- src/block_service/hdfs/hdfs_service.cpp | 1 + src/block_service/local/local_service.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/block_service/hdfs/hdfs_service.cpp b/src/block_service/hdfs/hdfs_service.cpp index 987195314b..41c479ebd4 100644 --- a/src/block_service/hdfs/hdfs_service.cpp +++ b/src/block_service/hdfs/hdfs_service.cpp @@ -41,6 +41,7 @@ #include "utils/fmt_logging.h" #include "utils/safe_strerror_posix.h" #include "utils/strings.h" +#include "utils/threadpool_code.h" #include "utils/utils.h" DSN_DEFINE_uint64(replication, diff --git a/src/block_service/local/local_service.cpp b/src/block_service/local/local_service.cpp index d7aa4e9ca9..5e88453f31 100644 --- a/src/block_service/local/local_service.cpp +++ b/src/block_service/local/local_service.cpp @@ -18,10 +18,10 @@ #include #include #include +#include #include #include -#include #include "local_service.h" #include "nlohmann/json.hpp" #include "rocksdb/slice.h" @@ -37,6 +37,7 @@ #include "utils/fmt_logging.h" #include "utils/load_dump_object.h" #include "utils/strings.h" +#include "utils/threadpool_code.h" DSN_DECLARE_bool(enable_direct_io); From f6707a8f980a96452255f91e401b10909fb3b7de Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Tue, 31 Dec 2024 15:50:07 +0800 Subject: [PATCH 3/8] follow clang-tidy --- src/nfs/nfs_code_definition.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nfs/nfs_code_definition.h b/src/nfs/nfs_code_definition.h index 9b94219e59..63b6a54fd6 100644 --- a/src/nfs/nfs_code_definition.h +++ b/src/nfs/nfs_code_definition.h @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include "task/task_code.h" #pragma once namespace dsn { From 1f720080c9d15ff9acfa730f6b081cb5969c5108 Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Tue, 31 Dec 2024 16:03:41 +0800 Subject: [PATCH 4/8] follow clang-tidy --- src/block_service/block_service.h | 2 +- src/block_service/hdfs/hdfs_service.cpp | 4 ++-- src/nfs/nfs_code_definition.h | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/block_service/block_service.h b/src/block_service/block_service.h index c90887fc96..f88ddbe208 100644 --- a/src/block_service/block_service.h +++ b/src/block_service/block_service.h @@ -44,7 +44,7 @@ namespace dist { namespace block_service { class block_file; -typedef dsn::ref_ptr block_file_ptr; +using block_file_ptr = dsn::ref_ptr; /** * @brief The ls_request struct, use to list all the files and directories under the dir_name diff --git a/src/block_service/hdfs/hdfs_service.cpp b/src/block_service/hdfs/hdfs_service.cpp index 41c479ebd4..2eb6592844 100644 --- a/src/block_service/hdfs/hdfs_service.cpp +++ b/src/block_service/hdfs/hdfs_service.cpp @@ -46,7 +46,7 @@ DSN_DEFINE_uint64(replication, hdfs_read_batch_size_bytes, - 64 << 20, + (64 << 20), "hdfs read batch size, the default value is 64MB"); DSN_TAG_VARIABLE(hdfs_read_batch_size_bytes, FT_MUTABLE); @@ -58,7 +58,7 @@ DSN_TAG_VARIABLE(hdfs_write_limit_rate_mb_per_sec, FT_MUTABLE); DSN_DEFINE_uint64(replication, hdfs_write_batch_size_bytes, - 64 << 20, + (64 << 20), "hdfs write batch size, the default value is 64MB"); DSN_TAG_VARIABLE(hdfs_write_batch_size_bytes, FT_MUTABLE); diff --git a/src/nfs/nfs_code_definition.h b/src/nfs/nfs_code_definition.h index 63b6a54fd6..b003aaab3e 100644 --- a/src/nfs/nfs_code_definition.h +++ b/src/nfs/nfs_code_definition.h @@ -27,8 +27,7 @@ #include "task/task_code.h" #pragma once -namespace dsn { -namespace service { +namespace dsn::service { // define RPC task code for service 'nfs' DEFINE_TASK_CODE_RPC(RPC_NFS_COPY, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) DEFINE_TASK_CODE_RPC(RPC_NFS_GET_FILE_SIZE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) @@ -41,5 +40,4 @@ DEFINE_TASK_CODE(LPC_NFS_FILE_CLOSE_TIMER, TASK_PRIORITY_COMMON, ::dsn::THREAD_P DEFINE_TASK_CODE_AIO(LPC_NFS_WRITE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) DEFINE_TASK_CODE_AIO(LPC_NFS_COPY_FILE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE) -} // namespace service -} // namespace dsn +} // namespace dsn::service \ No newline at end of file From 0101b69f2ef8429b9bd509d78f5e0cf894b7d87a Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Tue, 31 Dec 2024 16:05:38 +0800 Subject: [PATCH 5/8] follow clang-tidy --- src/block_service/hdfs/hdfs_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/block_service/hdfs/hdfs_service.cpp b/src/block_service/hdfs/hdfs_service.cpp index 2eb6592844..2393b1b4d0 100644 --- a/src/block_service/hdfs/hdfs_service.cpp +++ b/src/block_service/hdfs/hdfs_service.cpp @@ -46,7 +46,7 @@ DSN_DEFINE_uint64(replication, hdfs_read_batch_size_bytes, - (64 << 20), + 64U << 20, "hdfs read batch size, the default value is 64MB"); DSN_TAG_VARIABLE(hdfs_read_batch_size_bytes, FT_MUTABLE); @@ -58,7 +58,7 @@ DSN_TAG_VARIABLE(hdfs_write_limit_rate_mb_per_sec, FT_MUTABLE); DSN_DEFINE_uint64(replication, hdfs_write_batch_size_bytes, - (64 << 20), + 64U << 20, "hdfs write batch size, the default value is 64MB"); DSN_TAG_VARIABLE(hdfs_write_batch_size_bytes, FT_MUTABLE); From 1bf3209e78b08dfbd506cda95e95aa9233791b35 Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Tue, 31 Dec 2024 16:21:35 +0800 Subject: [PATCH 6/8] follow clang-tidy --- src/block_service/hdfs/hdfs_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/block_service/hdfs/hdfs_service.cpp b/src/block_service/hdfs/hdfs_service.cpp index 2393b1b4d0..eb2afcb24d 100644 --- a/src/block_service/hdfs/hdfs_service.cpp +++ b/src/block_service/hdfs/hdfs_service.cpp @@ -46,7 +46,7 @@ DSN_DEFINE_uint64(replication, hdfs_read_batch_size_bytes, - 64U << 20, + 64U << 20U, "hdfs read batch size, the default value is 64MB"); DSN_TAG_VARIABLE(hdfs_read_batch_size_bytes, FT_MUTABLE); @@ -58,7 +58,7 @@ DSN_TAG_VARIABLE(hdfs_write_limit_rate_mb_per_sec, FT_MUTABLE); DSN_DEFINE_uint64(replication, hdfs_write_batch_size_bytes, - 64U << 20, + 64U << 20U, "hdfs write batch size, the default value is 64MB"); DSN_TAG_VARIABLE(hdfs_write_batch_size_bytes, FT_MUTABLE); From 27cef1fe78c9909466475dc1022df81bf2023798 Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Thu, 2 Jan 2025 10:23:05 +0800 Subject: [PATCH 7/8] fix unit test --- src/nfs/test/config.ini | 12 +++++++++++- src/replica/storage/simple_kv/test/case-000.ini | 4 ++-- src/replica/storage/simple_kv/test/case-001.ini | 2 +- src/replica/storage/simple_kv/test/case-002.ini | 2 +- src/replica/storage/simple_kv/test/case-003.ini | 2 +- src/replica/storage/simple_kv/test/case-004.ini | 2 +- src/replica/storage/simple_kv/test/case-005.ini | 2 +- src/replica/storage/simple_kv/test/case-006.ini | 2 +- src/replica/storage/simple_kv/test/case-100.ini | 2 +- src/replica/storage/simple_kv/test/case-101.ini | 2 +- src/replica/storage/simple_kv/test/case-102.ini | 2 +- src/replica/storage/simple_kv/test/case-103.ini | 2 +- src/replica/storage/simple_kv/test/case-104.ini | 2 +- src/replica/storage/simple_kv/test/case-105.ini | 2 +- src/replica/storage/simple_kv/test/case-106.ini | 2 +- src/replica/storage/simple_kv/test/case-107.ini | 2 +- src/replica/storage/simple_kv/test/case-108.ini | 2 +- src/replica/storage/simple_kv/test/case-109.ini | 2 +- src/replica/storage/simple_kv/test/case-200.ini | 2 +- src/replica/storage/simple_kv/test/case-201.ini | 2 +- src/replica/storage/simple_kv/test/case-202-0.ini | 2 +- src/replica/storage/simple_kv/test/case-202-1.ini | 2 +- src/replica/storage/simple_kv/test/case-203-0.ini | 2 +- src/replica/storage/simple_kv/test/case-204.ini | 2 +- src/replica/storage/simple_kv/test/case-205.ini | 2 +- src/replica/storage/simple_kv/test/case-206.ini | 2 +- src/replica/storage/simple_kv/test/case-207.ini | 2 +- src/replica/storage/simple_kv/test/case-208.ini | 2 +- src/replica/storage/simple_kv/test/case-209.ini | 2 +- src/replica/storage/simple_kv/test/case-210.ini | 2 +- src/replica/storage/simple_kv/test/case-211.ini | 2 +- src/replica/storage/simple_kv/test/case-212.ini | 2 +- src/replica/storage/simple_kv/test/case-213.ini | 2 +- src/replica/storage/simple_kv/test/case-214.ini | 2 +- src/replica/storage/simple_kv/test/case-215.ini | 2 +- src/replica/storage/simple_kv/test/case-216.ini | 2 +- src/replica/storage/simple_kv/test/case-300-0.ini | 2 +- src/replica/storage/simple_kv/test/case-300-1.ini | 2 +- src/replica/storage/simple_kv/test/case-300-2.ini | 2 +- src/replica/storage/simple_kv/test/case-301.ini | 2 +- src/replica/storage/simple_kv/test/case-302.ini | 2 +- src/replica/storage/simple_kv/test/case-303.ini | 2 +- src/replica/storage/simple_kv/test/case-304.ini | 2 +- src/replica/storage/simple_kv/test/case-305.ini | 2 +- src/replica/storage/simple_kv/test/case-306.ini | 2 +- src/replica/storage/simple_kv/test/case-307.ini | 2 +- src/replica/storage/simple_kv/test/case-400.ini | 2 +- src/replica/storage/simple_kv/test/case-401.ini | 2 +- src/replica/storage/simple_kv/test/case-402.ini | 2 +- src/replica/storage/simple_kv/test/case-600.ini | 2 +- src/replica/storage/simple_kv/test/case-601.ini | 2 +- src/replica/storage/simple_kv/test/case-602.ini | 2 +- src/replica/storage/simple_kv/test/case-603.ini | 2 +- src/replica/storage/simple_kv/test/config.ini | 2 +- 54 files changed, 65 insertions(+), 55 deletions(-) diff --git a/src/nfs/test/config.ini b/src/nfs/test/config.ini index 214ae2f431..df496ac6ba 100644 --- a/src/nfs/test/config.ini +++ b/src/nfs/test/config.ini @@ -30,7 +30,7 @@ count = 1 type = dsn.app.mimic arguments = ports = 20101 -pools = THREAD_POOL_DEFAULT +pools = THREAD_POOL_BLOCK_SERVICE, THREAD_POOL_DEFAULT run = true count = 1 @@ -40,3 +40,13 @@ tool = nativerun pause_on_start = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger + +[threadpool..default] +worker_count = 2 +worker_priority = THREAD_xPRIORITY_LOWEST + +[threadpool.THREAD_POOL_BLOCK_SERVICE] + name = block_service + partitioned = false + worker_priority = THREAD_xPRIORITY_NORMAL + worker_count = 1 \ No newline at end of file diff --git a/src/replica/storage/simple_kv/test/case-000.ini b/src/replica/storage/simple_kv/test/case-000.ini index 34d18892fc..fc03cda30b 100644 --- a/src/replica/storage/simple_kv/test/case-000.ini +++ b/src/replica/storage/simple_kv/test/case-000.ini @@ -36,7 +36,7 @@ arguments = ports = 34601 run = true count = 1 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_META_SERVER,THREAD_POOL_FD,THREAD_POOL_META_STATE +pools = THREAD_POOL_DEFAULT,THREAD_POOL_META_SERVER,THREAD_POOL_FD,THREAD_POOL_META_STATE,THREAD_POOL_BLOCK_SERVICE [apps.r] type = replica @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-001.ini b/src/replica/storage/simple_kv/test/case-001.ini index edf1d69f46..a9ae0352f8 100644 --- a/src/replica/storage/simple_kv/test/case-001.ini +++ b/src/replica/storage/simple_kv/test/case-001.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-002.ini b/src/replica/storage/simple_kv/test/case-002.ini index d3012ab436..5766528d4f 100644 --- a/src/replica/storage/simple_kv/test/case-002.ini +++ b/src/replica/storage/simple_kv/test/case-002.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-003.ini b/src/replica/storage/simple_kv/test/case-003.ini index 86e91c5345..e7dde0e250 100644 --- a/src/replica/storage/simple_kv/test/case-003.ini +++ b/src/replica/storage/simple_kv/test/case-003.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-004.ini b/src/replica/storage/simple_kv/test/case-004.ini index e523a8d643..454d2ebde9 100644 --- a/src/replica/storage/simple_kv/test/case-004.ini +++ b/src/replica/storage/simple_kv/test/case-004.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-005.ini b/src/replica/storage/simple_kv/test/case-005.ini index 8e28e7b894..05de4924b2 100644 --- a/src/replica/storage/simple_kv/test/case-005.ini +++ b/src/replica/storage/simple_kv/test/case-005.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-006.ini b/src/replica/storage/simple_kv/test/case-006.ini index 386433359b..68a5a986b0 100644 --- a/src/replica/storage/simple_kv/test/case-006.ini +++ b/src/replica/storage/simple_kv/test/case-006.ini @@ -36,7 +36,7 @@ arguments = ports = 34601 run = true count = 1 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_META_SERVER,THREAD_POOL_FD,THREAD_POOL_META_STATE +pools = THREAD_POOL_DEFAULT,THREAD_POOL_META_SERVER,THREAD_POOL_FD,THREAD_POOL_META_STATE,THREAD_POOL_BLOCK_SERVICE [apps.r] type = replica diff --git a/src/replica/storage/simple_kv/test/case-100.ini b/src/replica/storage/simple_kv/test/case-100.ini index fb366b244e..15e8371a04 100644 --- a/src/replica/storage/simple_kv/test/case-100.ini +++ b/src/replica/storage/simple_kv/test/case-100.ini @@ -36,7 +36,7 @@ arguments = ports = 34601 run = true count = 1 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_META_SERVER,THREAD_POOL_FD,THREAD_POOL_META_STATE +pools = THREAD_POOL_DEFAULT,THREAD_POOL_META_SERVER,THREAD_POOL_FD,THREAD_POOL_META_STATE,THREAD_POOL_BLOCK_SERVICE [apps.r] type = replica diff --git a/src/replica/storage/simple_kv/test/case-101.ini b/src/replica/storage/simple_kv/test/case-101.ini index 2c840a8925..a1df05bdfd 100644 --- a/src/replica/storage/simple_kv/test/case-101.ini +++ b/src/replica/storage/simple_kv/test/case-101.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-102.ini b/src/replica/storage/simple_kv/test/case-102.ini index 99392e8056..1624c590b8 100644 --- a/src/replica/storage/simple_kv/test/case-102.ini +++ b/src/replica/storage/simple_kv/test/case-102.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-103.ini b/src/replica/storage/simple_kv/test/case-103.ini index 10b312756d..655359c606 100644 --- a/src/replica/storage/simple_kv/test/case-103.ini +++ b/src/replica/storage/simple_kv/test/case-103.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-104.ini b/src/replica/storage/simple_kv/test/case-104.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-104.ini +++ b/src/replica/storage/simple_kv/test/case-104.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-105.ini b/src/replica/storage/simple_kv/test/case-105.ini index 3019495bc4..d1ec1cdd78 100644 --- a/src/replica/storage/simple_kv/test/case-105.ini +++ b/src/replica/storage/simple_kv/test/case-105.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-106.ini b/src/replica/storage/simple_kv/test/case-106.ini index 2c840a8925..a1df05bdfd 100644 --- a/src/replica/storage/simple_kv/test/case-106.ini +++ b/src/replica/storage/simple_kv/test/case-106.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-107.ini b/src/replica/storage/simple_kv/test/case-107.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-107.ini +++ b/src/replica/storage/simple_kv/test/case-107.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-108.ini b/src/replica/storage/simple_kv/test/case-108.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-108.ini +++ b/src/replica/storage/simple_kv/test/case-108.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-109.ini b/src/replica/storage/simple_kv/test/case-109.ini index d489c02923..402b22bf09 100644 --- a/src/replica/storage/simple_kv/test/case-109.ini +++ b/src/replica/storage/simple_kv/test/case-109.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-200.ini b/src/replica/storage/simple_kv/test/case-200.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-200.ini +++ b/src/replica/storage/simple_kv/test/case-200.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-201.ini b/src/replica/storage/simple_kv/test/case-201.ini index b6801a0640..6563858aca 100644 --- a/src/replica/storage/simple_kv/test/case-201.ini +++ b/src/replica/storage/simple_kv/test/case-201.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-202-0.ini b/src/replica/storage/simple_kv/test/case-202-0.ini index a0fa07b3f5..d4dd36f226 100644 --- a/src/replica/storage/simple_kv/test/case-202-0.ini +++ b/src/replica/storage/simple_kv/test/case-202-0.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-202-1.ini b/src/replica/storage/simple_kv/test/case-202-1.ini index e523a8d643..454d2ebde9 100644 --- a/src/replica/storage/simple_kv/test/case-202-1.ini +++ b/src/replica/storage/simple_kv/test/case-202-1.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-203-0.ini b/src/replica/storage/simple_kv/test/case-203-0.ini index a0fa07b3f5..d4dd36f226 100644 --- a/src/replica/storage/simple_kv/test/case-203-0.ini +++ b/src/replica/storage/simple_kv/test/case-203-0.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-204.ini b/src/replica/storage/simple_kv/test/case-204.ini index 7ddbb8db2d..564fdf6280 100644 --- a/src/replica/storage/simple_kv/test/case-204.ini +++ b/src/replica/storage/simple_kv/test/case-204.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-205.ini b/src/replica/storage/simple_kv/test/case-205.ini index 602794b67f..06141e0061 100644 --- a/src/replica/storage/simple_kv/test/case-205.ini +++ b/src/replica/storage/simple_kv/test/case-205.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-206.ini b/src/replica/storage/simple_kv/test/case-206.ini index 28d2c4aaf0..8b90a458fd 100644 --- a/src/replica/storage/simple_kv/test/case-206.ini +++ b/src/replica/storage/simple_kv/test/case-206.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-207.ini b/src/replica/storage/simple_kv/test/case-207.ini index 7ddbb8db2d..564fdf6280 100644 --- a/src/replica/storage/simple_kv/test/case-207.ini +++ b/src/replica/storage/simple_kv/test/case-207.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-208.ini b/src/replica/storage/simple_kv/test/case-208.ini index 7ddbb8db2d..564fdf6280 100644 --- a/src/replica/storage/simple_kv/test/case-208.ini +++ b/src/replica/storage/simple_kv/test/case-208.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-209.ini b/src/replica/storage/simple_kv/test/case-209.ini index 7ddbb8db2d..564fdf6280 100644 --- a/src/replica/storage/simple_kv/test/case-209.ini +++ b/src/replica/storage/simple_kv/test/case-209.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-210.ini b/src/replica/storage/simple_kv/test/case-210.ini index 2652fed838..705b7369e3 100644 --- a/src/replica/storage/simple_kv/test/case-210.ini +++ b/src/replica/storage/simple_kv/test/case-210.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-211.ini b/src/replica/storage/simple_kv/test/case-211.ini index d07b7fcb86..4f9a111d6d 100644 --- a/src/replica/storage/simple_kv/test/case-211.ini +++ b/src/replica/storage/simple_kv/test/case-211.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-212.ini b/src/replica/storage/simple_kv/test/case-212.ini index 1b3c09bd1c..1ad9139142 100644 --- a/src/replica/storage/simple_kv/test/case-212.ini +++ b/src/replica/storage/simple_kv/test/case-212.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-213.ini b/src/replica/storage/simple_kv/test/case-213.ini index 3098910b7e..5cd3e1fcf2 100644 --- a/src/replica/storage/simple_kv/test/case-213.ini +++ b/src/replica/storage/simple_kv/test/case-213.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-214.ini b/src/replica/storage/simple_kv/test/case-214.ini index 602794b67f..06141e0061 100644 --- a/src/replica/storage/simple_kv/test/case-214.ini +++ b/src/replica/storage/simple_kv/test/case-214.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-215.ini b/src/replica/storage/simple_kv/test/case-215.ini index 28d2c4aaf0..8b90a458fd 100644 --- a/src/replica/storage/simple_kv/test/case-215.ini +++ b/src/replica/storage/simple_kv/test/case-215.ini @@ -45,7 +45,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-216.ini b/src/replica/storage/simple_kv/test/case-216.ini index 7ddbb8db2d..564fdf6280 100644 --- a/src/replica/storage/simple_kv/test/case-216.ini +++ b/src/replica/storage/simple_kv/test/case-216.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-300-0.ini b/src/replica/storage/simple_kv/test/case-300-0.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-300-0.ini +++ b/src/replica/storage/simple_kv/test/case-300-0.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-300-1.ini b/src/replica/storage/simple_kv/test/case-300-1.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-300-1.ini +++ b/src/replica/storage/simple_kv/test/case-300-1.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-300-2.ini b/src/replica/storage/simple_kv/test/case-300-2.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-300-2.ini +++ b/src/replica/storage/simple_kv/test/case-300-2.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-301.ini b/src/replica/storage/simple_kv/test/case-301.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-301.ini +++ b/src/replica/storage/simple_kv/test/case-301.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-302.ini b/src/replica/storage/simple_kv/test/case-302.ini index fcab05e782..6b67c041db 100644 --- a/src/replica/storage/simple_kv/test/case-302.ini +++ b/src/replica/storage/simple_kv/test/case-302.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-303.ini b/src/replica/storage/simple_kv/test/case-303.ini index e3fefc0fb3..e4bc2cb2ec 100644 --- a/src/replica/storage/simple_kv/test/case-303.ini +++ b/src/replica/storage/simple_kv/test/case-303.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-304.ini b/src/replica/storage/simple_kv/test/case-304.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-304.ini +++ b/src/replica/storage/simple_kv/test/case-304.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-305.ini b/src/replica/storage/simple_kv/test/case-305.ini index e3fefc0fb3..e4bc2cb2ec 100644 --- a/src/replica/storage/simple_kv/test/case-305.ini +++ b/src/replica/storage/simple_kv/test/case-305.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-306.ini b/src/replica/storage/simple_kv/test/case-306.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-306.ini +++ b/src/replica/storage/simple_kv/test/case-306.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-307.ini b/src/replica/storage/simple_kv/test/case-307.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-307.ini +++ b/src/replica/storage/simple_kv/test/case-307.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-400.ini b/src/replica/storage/simple_kv/test/case-400.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-400.ini +++ b/src/replica/storage/simple_kv/test/case-400.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-401.ini b/src/replica/storage/simple_kv/test/case-401.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-401.ini +++ b/src/replica/storage/simple_kv/test/case-401.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-402.ini b/src/replica/storage/simple_kv/test/case-402.ini index fb366b244e..d8977812be 100644 --- a/src/replica/storage/simple_kv/test/case-402.ini +++ b/src/replica/storage/simple_kv/test/case-402.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-600.ini b/src/replica/storage/simple_kv/test/case-600.ini index 386433359b..f525c13c11 100644 --- a/src/replica/storage/simple_kv/test/case-600.ini +++ b/src/replica/storage/simple_kv/test/case-600.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-601.ini b/src/replica/storage/simple_kv/test/case-601.ini index f9e2f3b969..c045e1558f 100644 --- a/src/replica/storage/simple_kv/test/case-601.ini +++ b/src/replica/storage/simple_kv/test/case-601.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-602.ini b/src/replica/storage/simple_kv/test/case-602.ini index 386433359b..f525c13c11 100644 --- a/src/replica/storage/simple_kv/test/case-602.ini +++ b/src/replica/storage/simple_kv/test/case-602.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/case-603.ini b/src/replica/storage/simple_kv/test/case-603.ini index dd29d532db..d94c913e7d 100644 --- a/src/replica/storage/simple_kv/test/case-603.ini +++ b/src/replica/storage/simple_kv/test/case-603.ini @@ -46,7 +46,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE [apps.c] type = client diff --git a/src/replica/storage/simple_kv/test/config.ini b/src/replica/storage/simple_kv/test/config.ini index 5622b9ff0f..9f56c25d22 100644 --- a/src/replica/storage/simple_kv/test/config.ini +++ b/src/replica/storage/simple_kv/test/config.ini @@ -52,7 +52,7 @@ arguments = ports = 34801 run = true count = 3 -pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG +pools = THREAD_POOL_DEFAULT,THREAD_POOL_REPLICATION_LONG,THREAD_POOL_REPLICATION,THREAD_POOL_FD,THREAD_POOL_LOCAL_APP,THREAD_POOL_PLOG,THREAD_POOL_BLOCK_SERVICE hosted_app_type_name = simple_kv hosted_app_arguments = From e091cd90b03079b5a24a56eaeeee963e510f69b3 Mon Sep 17 00:00:00 2001 From: lupengfan1 Date: Thu, 2 Jan 2025 11:36:20 +0800 Subject: [PATCH 8/8] follow iwyu --- src/replica/replica_backup.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/replica/replica_backup.cpp b/src/replica/replica_backup.cpp index 3e8856bee1..1be16e30c0 100644 --- a/src/replica/replica_backup.cpp +++ b/src/replica/replica_backup.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include