Skip to content

Commit 16f7cc4

Browse files
author
lupengfan1
committed
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:#1969
1 parent 297d605 commit 16f7cc4

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

src/block_service/block_service.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ namespace dsn {
4343
namespace dist {
4444
namespace block_service {
4545

46-
DEFINE_THREAD_POOL_CODE(THREAD_POOL_BLOCK_SERVICE)
47-
4846
class block_file;
4947
typedef dsn::ref_ptr<block_file> block_file_ptr;
5048

src/nfs/nfs_code_definition.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
namespace dsn {
3030
namespace service {
3131
// define RPC task code for service 'nfs'
32-
DEFINE_TASK_CODE_RPC(RPC_NFS_COPY, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT)
33-
DEFINE_TASK_CODE_RPC(RPC_NFS_GET_FILE_SIZE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT)
32+
DEFINE_TASK_CODE_RPC(RPC_NFS_COPY, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE)
33+
DEFINE_TASK_CODE_RPC(RPC_NFS_GET_FILE_SIZE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE)
3434
// test timer task code
3535
DEFINE_TASK_CODE(LPC_NFS_REQUEST_TIMER, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT)
3636

37-
DEFINE_TASK_CODE_AIO(LPC_NFS_READ, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT)
38-
DEFINE_TASK_CODE(LPC_NFS_FILE_CLOSE_TIMER, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT)
37+
DEFINE_TASK_CODE_AIO(LPC_NFS_READ, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE)
38+
DEFINE_TASK_CODE(LPC_NFS_FILE_CLOSE_TIMER, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT)
3939

40-
DEFINE_TASK_CODE_AIO(LPC_NFS_WRITE, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT)
40+
DEFINE_TASK_CODE_AIO(LPC_NFS_WRITE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE)
4141

42-
DEFINE_TASK_CODE_AIO(LPC_NFS_COPY_FILE, TASK_PRIORITY_COMMON, THREAD_POOL_DEFAULT)
42+
DEFINE_TASK_CODE_AIO(LPC_NFS_COPY_FILE, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_BLOCK_SERVICE)
4343
} // namespace service
4444
} // namespace dsn

src/utils/threadpool_code.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class threadpool_code
6666

6767
DEFINE_THREAD_POOL_CODE(THREAD_POOL_INVALID)
6868
DEFINE_THREAD_POOL_CODE(THREAD_POOL_DEFAULT)
69+
DEFINE_THREAD_POOL_CODE(THREAD_POOL_BLOCK_SERVICE)
6970
} // namespace dsn
7071

7172
USER_DEFINED_STRUCTURE_FORMATTER(::dsn::threadpool_code);

0 commit comments

Comments
 (0)