From e5bf33ef98de0e46d7e9779cb14ed94a47845f6e Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sat, 15 Jun 2019 14:36:03 +0800 Subject: [PATCH 1/9] refactor: remove hpc_logger from configs --- src/base/test/config.ini | 5 ----- src/geo/bench/config.ini | 5 ----- src/geo/test/config.ini | 5 ----- src/sample/config.ini | 5 ----- src/server/config-server.ini | 5 ----- src/server/config.ini | 4 ---- src/server/test/config.ini | 5 ----- src/shell/config.ini | 5 ----- src/test/bench_test/config.ini | 4 ---- src/test/function_test/config.ini | 1 - src/test/kill_test/config.ini | 5 ----- src/test/upgrade_test/config.ini | 5 ----- 12 files changed, 54 deletions(-) diff --git a/src/base/test/config.ini b/src/base/test/config.ini index 05d9396976..c8a7d95d55 100644 --- a/src/base/test/config.ini +++ b/src/base/test/config.ini @@ -28,7 +28,6 @@ start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true enable_default_app_mimic = true @@ -41,10 +40,6 @@ fast_flush = true max_number_of_log_files_on_disk = 10 stderr_start_level = LOG_LEVEL_ERROR -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 10 - [tools.simulator] random_seed = 0 diff --git a/src/geo/bench/config.ini b/src/geo/bench/config.ini index 334c196094..b39d764da8 100644 --- a/src/geo/bench/config.ini +++ b/src/geo/bench/config.ini @@ -28,7 +28,6 @@ start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true enable_default_app_mimic = true @@ -41,10 +40,6 @@ fast_flush = true max_number_of_log_files_on_disk = 10 stderr_start_level = LOG_LEVEL_ERROR -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 10 - [tools.simulator] random_seed = 0 diff --git a/src/geo/test/config.ini b/src/geo/test/config.ini index 05d9396976..c8a7d95d55 100644 --- a/src/geo/test/config.ini +++ b/src/geo/test/config.ini @@ -28,7 +28,6 @@ start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true enable_default_app_mimic = true @@ -41,10 +40,6 @@ fast_flush = true max_number_of_log_files_on_disk = 10 stderr_start_level = LOG_LEVEL_ERROR -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 10 - [tools.simulator] random_seed = 0 diff --git a/src/sample/config.ini b/src/sample/config.ini index 866d29b53f..f7bcf64df4 100644 --- a/src/sample/config.ini +++ b/src/sample/config.ini @@ -28,7 +28,6 @@ start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true enable_default_app_mimic = true @@ -41,10 +40,6 @@ fast_flush = true max_number_of_log_files_on_disk = 10 stderr_start_level = LOG_LEVEL_ERROR -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 10 - [tools.simulator] random_seed = 0 diff --git a/src/server/config-server.ini b/src/server/config-server.ini index 7472a79055..14e7ab484d 100644 --- a/src/server/config-server.ini +++ b/src/server/config-server.ini @@ -47,7 +47,6 @@ start_nfs = true logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true [block_service.fds_service] @@ -64,10 +63,6 @@ fast_flush = false max_number_of_log_files_on_disk = 100000 stderr_start_level = LOG_LEVEL_FATAL -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 100000 - [tools.simulator] random_seed = 0 diff --git a/src/server/config.ini b/src/server/config.ini index b90d17d1fc..0a5452335b 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -61,10 +61,6 @@ max_number_of_log_files_on_disk = 500 stderr_start_level = LOG_LEVEL_ERROR -[tools.hpc_logger] - per_thread_buffer_bytes = 8192 - max_number_of_log_files_on_disk = 200 - [nfs] nfs_copy_block_bytes = 4194304 max_concurrent_remote_copy_requests = 50 diff --git a/src/server/test/config.ini b/src/server/test/config.ini index b161ffa1a2..007fc3d07b 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -29,7 +29,6 @@ start_nfs = true logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true [block_service.fds_service] @@ -46,10 +45,6 @@ fast_flush = false max_number_of_log_files_on_disk = 100000 stderr_start_level = LOG_LEVEL_FATAL -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 100000 - [tools.simulator] random_seed = 0 diff --git a/src/shell/config.ini b/src/shell/config.ini index 6cf1bb4ccf..a5e0b63bef 100644 --- a/src/shell/config.ini +++ b/src/shell/config.ini @@ -28,7 +28,6 @@ start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = false enable_default_app_mimic = true @@ -41,10 +40,6 @@ fast_flush = true max_number_of_log_files_on_disk = 10 stderr_start_level = LOG_LEVEL_FATAL -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 10 - [tools.simulator] random_seed = 0 diff --git a/src/test/bench_test/config.ini b/src/test/bench_test/config.ini index bf19c3b235..f29141d190 100644 --- a/src/test/bench_test/config.ini +++ b/src/test/bench_test/config.ini @@ -40,10 +40,6 @@ fast_flush = false max_number_of_log_files_on_disk = 10 stderr_start_level = LOG_LEVEL_FATAL -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 10 - [tools.simulator] random_seed = 0 diff --git a/src/test/function_test/config.ini b/src/test/function_test/config.ini index 95069f4eb3..f095032b40 100644 --- a/src/test/function_test/config.ini +++ b/src/test/function_test/config.ini @@ -27,7 +27,6 @@ cli_remote = false start_nfs = false logging_start_level = LOG_LEVEL_DEBUG -;logging_factory_name = dsn::tools::hpc_logger logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/test/kill_test/config.ini b/src/test/kill_test/config.ini index de90b5ee66..003d321d22 100644 --- a/src/test/kill_test/config.ini +++ b/src/test/kill_test/config.ini @@ -29,7 +29,6 @@ start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true enable_default_app_mimic = true @@ -42,10 +41,6 @@ fast_flush = true max_number_of_log_files_on_disk = 1000 stderr_start_level = LOG_LEVEL_FATAL -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 1000 - [tools.simulator] random_seed = 0 diff --git a/src/test/upgrade_test/config.ini b/src/test/upgrade_test/config.ini index d58f7deb4c..491af1a467 100644 --- a/src/test/upgrade_test/config.ini +++ b/src/test/upgrade_test/config.ini @@ -29,7 +29,6 @@ start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger -;logging_factory_name = dsn::tools::hpc_logger logging_flush_on_exit = true enable_default_app_mimic = true @@ -42,10 +41,6 @@ fast_flush = true max_number_of_log_files_on_disk = 100000 stderr_start_level = LOG_LEVEL_FATAL -[tools.hpc_logger] -per_thread_buffer_bytes = 8192 -max_number_of_log_files_on_disk = 100000 - [tools.simulator] random_seed = 0 From 69f966dd72ad671bffceee0b1ff68c63f5e50fe3 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sat, 15 Jun 2019 15:05:40 +0800 Subject: [PATCH 2/9] refactor: remove useless arg max_input_queue_length --- src/base/test/config.ini | 1 - src/geo/bench/config.ini | 1 - src/geo/test/config.ini | 1 - src/redis_protocol/proxy/config.ini | 1 - src/redis_protocol/proxy_ut/config.ini | 1 - src/sample/config.ini | 1 - src/server/config.ini | 9 --------- src/server/test/config.ini | 6 ------ src/shell/config.ini | 1 - src/test/bench_test/config.ini | 1 - src/test/function_test/config.ini | 1 - src/test/kill_test/config.ini | 1 - src/test/upgrade_test/config.ini | 1 - 13 files changed, 26 deletions(-) diff --git a/src/base/test/config.ini b/src/base/test/config.ini index c8a7d95d55..122257ddc4 100644 --- a/src/base/test/config.ini +++ b/src/base/test/config.ini @@ -54,7 +54,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 4 diff --git a/src/geo/bench/config.ini b/src/geo/bench/config.ini index b39d764da8..debea08ad9 100644 --- a/src/geo/bench/config.ini +++ b/src/geo/bench/config.ini @@ -54,7 +54,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 4 diff --git a/src/geo/test/config.ini b/src/geo/test/config.ini index c8a7d95d55..122257ddc4 100644 --- a/src/geo/test/config.ini +++ b/src/geo/test/config.ini @@ -54,7 +54,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 4 diff --git a/src/redis_protocol/proxy/config.ini b/src/redis_protocol/proxy/config.ini index 298fefda77..0c11300b6a 100644 --- a/src/redis_protocol/proxy/config.ini +++ b/src/redis_protocol/proxy/config.ini @@ -60,7 +60,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 4 diff --git a/src/redis_protocol/proxy_ut/config.ini b/src/redis_protocol/proxy_ut/config.ini index ac4fa11764..5f8de54bd8 100644 --- a/src/redis_protocol/proxy_ut/config.ini +++ b/src/redis_protocol/proxy_ut/config.ini @@ -60,7 +60,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 4 diff --git a/src/sample/config.ini b/src/sample/config.ini index f7bcf64df4..bfb281d526 100644 --- a/src/sample/config.ini +++ b/src/sample/config.ini @@ -54,7 +54,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 4 diff --git a/src/server/config.ini b/src/server/config.ini index 0a5452335b..3c51816446 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -82,63 +82,54 @@ [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false - max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 [threadpool.THREAD_POOL_REPLICATION] name = replica partitioned = true - max_input_queue_length = 2048 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 24 [threadpool.THREAD_POOL_META_STATE] name = meta_state partitioned = true - max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 1 [threadpool.THREAD_POOL_DLOCK] name = dist_lock partitioned = true - max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 1 [threadpool.THREAD_POOL_FD] name = fd partitioned = false - max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 2 [threadpool.THREAD_POOL_LOCAL_APP] name = local_app partitioned = false - max_input_queue_length = 2048 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 24 [threadpool.THREAD_POOL_REPLICATION_LONG] name = rep_long partitioned = false - max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 [threadpool.THREAD_POOL_FDS_SERVICE] name = fds_service worker_count = 8 - max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 [threadpool.THREAD_POOL_COMPACT] name = compact partitioned = false - max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 diff --git a/src/server/test/config.ini b/src/server/test/config.ini index 007fc3d07b..d86aeee926 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -59,42 +59,36 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 [threadpool.THREAD_POOL_REPLICATION] name = replica partitioned = true -max_input_queue_length = 2048 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 10 [threadpool.THREAD_POOL_DLOCK] name = dist_lock partitioned = true -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 1 [threadpool.THREAD_POOL_FD] name = fd partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 2 [threadpool.THREAD_POOL_LOCAL_APP] name = local_app partitioned = false -max_input_queue_length = 2048 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 [threadpool.THREAD_POOL_REPLICATION_LONG] name = rep_long partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 4 diff --git a/src/shell/config.ini b/src/shell/config.ini index a5e0b63bef..8080de8d52 100644 --- a/src/shell/config.ini +++ b/src/shell/config.ini @@ -51,7 +51,6 @@ io_service_worker_count = 4 [threadpool..default] worker_count = 4 partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL [threadpool.THREAD_POOL_DEFAULT] diff --git a/src/test/bench_test/config.ini b/src/test/bench_test/config.ini index f29141d190..af9d9c2d6e 100644 --- a/src/test/bench_test/config.ini +++ b/src/test/bench_test/config.ini @@ -54,7 +54,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 10 diff --git a/src/test/function_test/config.ini b/src/test/function_test/config.ini index f095032b40..10ca278130 100644 --- a/src/test/function_test/config.ini +++ b/src/test/function_test/config.ini @@ -51,7 +51,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 diff --git a/src/test/kill_test/config.ini b/src/test/kill_test/config.ini index 003d321d22..388346a51b 100644 --- a/src/test/kill_test/config.ini +++ b/src/test/kill_test/config.ini @@ -55,7 +55,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 diff --git a/src/test/upgrade_test/config.ini b/src/test/upgrade_test/config.ini index 491af1a467..da63ee416b 100644 --- a/src/test/upgrade_test/config.ini +++ b/src/test/upgrade_test/config.ini @@ -55,7 +55,6 @@ worker_count = 4 [threadpool.THREAD_POOL_DEFAULT] name = default partitioned = false -max_input_queue_length = 1024 worker_priority = THREAD_xPRIORITY_NORMAL worker_count = 8 From 39ebe0bd9bf06c006691745f8267c7d81630c185 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sat, 15 Jun 2019 16:07:45 +0800 Subject: [PATCH 3/9] refactor: remove cli_local & cli_remote --- src/base/test/config.ini | 2 -- src/geo/bench/config.ini | 2 -- src/geo/test/config.ini | 2 -- src/redis_protocol/proxy/config.ini | 2 -- src/redis_protocol/proxy_ut/config.ini | 2 -- src/sample/config.ini | 2 -- src/server/config.ini | 2 -- src/server/test/config.ini | 2 -- src/shell/config.ini | 2 -- src/test/bench_test/config.ini | 2 -- src/test/function_test/config.ini | 2 -- src/test/kill_test/config.ini | 2 -- src/test/upgrade_test/config.ini | 2 -- 13 files changed, 26 deletions(-) diff --git a/src/base/test/config.ini b/src/base/test/config.ini index 122257ddc4..876b65be4f 100644 --- a/src/base/test/config.ini +++ b/src/base/test/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/geo/bench/config.ini b/src/geo/bench/config.ini index debea08ad9..ebebb74093 100644 --- a/src/geo/bench/config.ini +++ b/src/geo/bench/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/geo/test/config.ini b/src/geo/test/config.ini index 122257ddc4..876b65be4f 100644 --- a/src/geo/test/config.ini +++ b/src/geo/test/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/redis_protocol/proxy/config.ini b/src/redis_protocol/proxy/config.ini index 0c11300b6a..858eb29058 100644 --- a/src/redis_protocol/proxy/config.ini +++ b/src/redis_protocol/proxy/config.ini @@ -29,8 +29,6 @@ tool = nativerun toollets = profiler ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/redis_protocol/proxy_ut/config.ini b/src/redis_protocol/proxy_ut/config.ini index 5f8de54bd8..f0a8b3dd48 100644 --- a/src/redis_protocol/proxy_ut/config.ini +++ b/src/redis_protocol/proxy_ut/config.ini @@ -29,8 +29,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/sample/config.ini b/src/sample/config.ini index bfb281d526..6feeecd6bd 100644 --- a/src/sample/config.ini +++ b/src/sample/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/server/config.ini b/src/server/config.ini index 3c51816446..bb8467da5b 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -46,8 +46,6 @@ toollets = profiler pause_on_start = false - cli_local = false - cli_remote = true enable_default_app_mimic = true start_nfs = true diff --git a/src/server/test/config.ini b/src/server/test/config.ini index d86aeee926..75f61612cb 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -21,8 +21,6 @@ tool = nativerun toollets = profiler ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = true -cli_remote = true ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = true diff --git a/src/shell/config.ini b/src/shell/config.ini index 8080de8d52..a3a154822d 100644 --- a/src/shell/config.ini +++ b/src/shell/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/test/bench_test/config.ini b/src/test/bench_test/config.ini index af9d9c2d6e..56c76d0e1d 100644 --- a/src/test/bench_test/config.ini +++ b/src/test/bench_test/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/test/function_test/config.ini b/src/test/function_test/config.ini index 10ca278130..01d7dc3fd7 100644 --- a/src/test/function_test/config.ini +++ b/src/test/function_test/config.ini @@ -20,8 +20,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/test/kill_test/config.ini b/src/test/kill_test/config.ini index 388346a51b..ad99da3104 100644 --- a/src/test/kill_test/config.ini +++ b/src/test/kill_test/config.ini @@ -20,8 +20,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false diff --git a/src/test/upgrade_test/config.ini b/src/test/upgrade_test/config.ini index da63ee416b..254f34b668 100644 --- a/src/test/upgrade_test/config.ini +++ b/src/test/upgrade_test/config.ini @@ -20,8 +20,6 @@ tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false ;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false From 60fad0cc28e99cd820390275191bb4c325f343d3 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sat, 15 Jun 2019 16:28:53 +0800 Subject: [PATCH 4/9] refactor: remove updating_rocksdb_sstsize_interval_seconds --- src/server/config.ini | 1 - src/server/test/config.ini | 1 - 2 files changed, 2 deletions(-) diff --git a/src/server/config.ini b/src/server/config.ini index bb8467da5b..98198425ae 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -269,7 +269,6 @@ checkpoint_reserve_min_count = 2 checkpoint_reserve_time_seconds = 1800 - updating_rocksdb_sstsize_interval_seconds = 600 manual_compact_min_interval_seconds = 600 diff --git a/src/server/test/config.ini b/src/server/test/config.ini index 75f61612cb..4a8575907d 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -188,7 +188,6 @@ max_concurrent_uploading_file_count = 5 [pegasus.server] rocksdb_verbose_log = false rocksdb_write_buffer_size = 10485760 -updating_rocksdb_sstsize_interval_seconds = 30 verify_timetag = true perf_counter_cluster_name = onebox From bd5439130f201136ea00b4d7834e57d9de8d0012 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sat, 15 Jun 2019 16:28:53 +0800 Subject: [PATCH 5/9] refactor: remove start_nfs --- src/base/test/config.ini | 1 - src/geo/bench/config.ini | 1 - src/geo/test/config.ini | 1 - src/redis_protocol/proxy/config.ini | 1 - src/redis_protocol/proxy_ut/config.ini | 1 - src/sample/config.ini | 1 - src/server/config.ini | 2 -- src/server/test/config.ini | 2 -- src/shell/config.ini | 1 - src/test/bench_test/config.ini | 1 - src/test/function_test/config.ini | 1 - src/test/kill_test/config.ini | 1 - src/test/upgrade_test/config.ini | 1 - 13 files changed, 15 deletions(-) diff --git a/src/base/test/config.ini b/src/base/test/config.ini index 876b65be4f..11998aa3a3 100644 --- a/src/base/test/config.ini +++ b/src/base/test/config.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/geo/bench/config.ini b/src/geo/bench/config.ini index ebebb74093..eb0d186a3c 100644 --- a/src/geo/bench/config.ini +++ b/src/geo/bench/config.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/geo/test/config.ini b/src/geo/test/config.ini index 876b65be4f..11998aa3a3 100644 --- a/src/geo/test/config.ini +++ b/src/geo/test/config.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/redis_protocol/proxy/config.ini b/src/redis_protocol/proxy/config.ini index 858eb29058..92f218d37a 100644 --- a/src/redis_protocol/proxy/config.ini +++ b/src/redis_protocol/proxy/config.ini @@ -31,7 +31,6 @@ toollets = profiler pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/redis_protocol/proxy_ut/config.ini b/src/redis_protocol/proxy_ut/config.ini index f0a8b3dd48..de66e0d481 100644 --- a/src/redis_protocol/proxy_ut/config.ini +++ b/src/redis_protocol/proxy_ut/config.ini @@ -31,7 +31,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/sample/config.ini b/src/sample/config.ini index 6feeecd6bd..738892fa9a 100644 --- a/src/sample/config.ini +++ b/src/sample/config.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/server/config.ini b/src/server/config.ini index bb8467da5b..64ecd3059a 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -47,7 +47,6 @@ pause_on_start = false enable_default_app_mimic = true - start_nfs = true logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger @@ -269,7 +268,6 @@ checkpoint_reserve_min_count = 2 checkpoint_reserve_time_seconds = 1800 - updating_rocksdb_sstsize_interval_seconds = 600 manual_compact_min_interval_seconds = 600 diff --git a/src/server/test/config.ini b/src/server/test/config.ini index 75f61612cb..0254ef5333 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -22,7 +22,6 @@ toollets = profiler ;toollets = tracer, profiler, fault_injector pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = true logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger @@ -188,7 +187,6 @@ max_concurrent_uploading_file_count = 5 [pegasus.server] rocksdb_verbose_log = false rocksdb_write_buffer_size = 10485760 -updating_rocksdb_sstsize_interval_seconds = 30 verify_timetag = true perf_counter_cluster_name = onebox diff --git a/src/shell/config.ini b/src/shell/config.ini index a3a154822d..2ed07fd3d6 100644 --- a/src/shell/config.ini +++ b/src/shell/config.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/test/bench_test/config.ini b/src/test/bench_test/config.ini index 56c76d0e1d..3c16d4d2f0 100644 --- a/src/test/bench_test/config.ini +++ b/src/test/bench_test/config.ini @@ -21,7 +21,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/test/function_test/config.ini b/src/test/function_test/config.ini index 01d7dc3fd7..33ae03403b 100644 --- a/src/test/function_test/config.ini +++ b/src/test/function_test/config.ini @@ -22,7 +22,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/test/kill_test/config.ini b/src/test/kill_test/config.ini index ad99da3104..923d118c7d 100644 --- a/src/test/kill_test/config.ini +++ b/src/test/kill_test/config.ini @@ -22,7 +22,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/test/upgrade_test/config.ini b/src/test/upgrade_test/config.ini index 254f34b668..dc89e5bc29 100644 --- a/src/test/upgrade_test/config.ini +++ b/src/test/upgrade_test/config.ini @@ -22,7 +22,6 @@ tool = nativerun pause_on_start = false ;aio_factory_name = dsn::tools::native_aio_provider -start_nfs = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger From 9eea7dabe28e639b51bd705e828eb440e3e54790 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sat, 15 Jun 2019 18:48:33 +0800 Subject: [PATCH 6/9] remove fast_execution_in_network_thread --- src/base/test/config.ini | 1 - src/geo/bench/config.ini | 1 - src/geo/test/config.ini | 1 - src/redis_protocol/proxy/config.ini | 1 - src/redis_protocol/proxy_ut/config.ini | 1 - src/sample/config.ini | 1 - src/server/config.ini | 1 - src/server/test/config.ini | 1 - src/shell/config.ini | 1 - src/test/function_test/config.ini | 1 - src/test/kill_test/config.ini | 1 - src/test/upgrade_test/config.ini | 1 - 12 files changed, 12 deletions(-) diff --git a/src/base/test/config.ini b/src/base/test/config.ini index 11998aa3a3..bfa6447978 100644 --- a/src/base/test/config.ini +++ b/src/base/test/config.ini @@ -58,7 +58,6 @@ worker_count = 4 is_trace = false is_profile = false allow_inline = false -fast_execution_in_network_thread = false rpc_call_header_format = NET_HDR_DSN rpc_call_channel = RPC_CHANNEL_TCP rpc_timeout_milliseconds = 5000 diff --git a/src/geo/bench/config.ini b/src/geo/bench/config.ini index eb0d186a3c..fd527aa5d8 100644 --- a/src/geo/bench/config.ini +++ b/src/geo/bench/config.ini @@ -58,7 +58,6 @@ worker_count = 4 is_trace = false is_profile = false allow_inline = false -fast_execution_in_network_thread = false rpc_call_header_format = NET_HDR_DSN rpc_call_channel = RPC_CHANNEL_TCP rpc_timeout_milliseconds = 5000 diff --git a/src/geo/test/config.ini b/src/geo/test/config.ini index 11998aa3a3..bfa6447978 100644 --- a/src/geo/test/config.ini +++ b/src/geo/test/config.ini @@ -58,7 +58,6 @@ worker_count = 4 is_trace = false is_profile = false allow_inline = false -fast_execution_in_network_thread = false rpc_call_header_format = NET_HDR_DSN rpc_call_channel = RPC_CHANNEL_TCP rpc_timeout_milliseconds = 5000 diff --git a/src/redis_protocol/proxy/config.ini b/src/redis_protocol/proxy/config.ini index 92f218d37a..70e5507472 100644 --- a/src/redis_protocol/proxy/config.ini +++ b/src/redis_protocol/proxy/config.ini @@ -70,7 +70,6 @@ is_trace = false is_profile = false allow_inline = false rpc_call_channel = RPC_CHANNEL_TCP -fast_execution_in_network_thread = false rpc_call_header_format_name = dsn rpc_timeout_milliseconds = 5000 diff --git a/src/redis_protocol/proxy_ut/config.ini b/src/redis_protocol/proxy_ut/config.ini index de66e0d481..cc3cded232 100644 --- a/src/redis_protocol/proxy_ut/config.ini +++ b/src/redis_protocol/proxy_ut/config.ini @@ -70,7 +70,6 @@ is_trace = false is_profile = false allow_inline = false rpc_call_channel = RPC_CHANNEL_TCP -fast_execution_in_network_thread = false rpc_call_header_format_name = dsn rpc_timeout_milliseconds = 5000 diff --git a/src/sample/config.ini b/src/sample/config.ini index 738892fa9a..43c25b9f7c 100644 --- a/src/sample/config.ini +++ b/src/sample/config.ini @@ -58,7 +58,6 @@ worker_count = 4 is_trace = false is_profile = false allow_inline = false -fast_execution_in_network_thread = false rpc_call_header_format = NET_HDR_DSN rpc_call_channel = RPC_CHANNEL_TCP rpc_timeout_milliseconds = 5000 diff --git a/src/server/config.ini b/src/server/config.ini index 64ecd3059a..1ce8ab2114 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -313,7 +313,6 @@ rpc_call_channel = RPC_CHANNEL_TCP rpc_call_header_format = NET_HDR_DSN rpc_message_crc_required = false - fast_execution_in_network_thread = false rpc_call_header_format_name = dsn rpc_timeout_milliseconds = 5000 diff --git a/src/server/test/config.ini b/src/server/test/config.ini index 0254ef5333..efe45e1ffe 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -101,7 +101,6 @@ worker_count = 1 is_trace = false is_profile = false allow_inline = false -fast_execution_in_network_thread = false rpc_call_header_format = NET_HDR_DSN rpc_call_channel = RPC_CHANNEL_TCP rpc_timeout_milliseconds = 5000 diff --git a/src/shell/config.ini b/src/shell/config.ini index 2ed07fd3d6..e8f9787ab8 100644 --- a/src/shell/config.ini +++ b/src/shell/config.ini @@ -61,7 +61,6 @@ name = meta_server is_trace = false is_profile = false allow_inline = false -fast_execution_in_network_thread = false rpc_call_header_format = NET_HDR_DSN rpc_call_channel = RPC_CHANNEL_TCP rpc_timeout_milliseconds = 10000 diff --git a/src/test/function_test/config.ini b/src/test/function_test/config.ini index 33ae03403b..645343d0fa 100644 --- a/src/test/function_test/config.ini +++ b/src/test/function_test/config.ini @@ -57,7 +57,6 @@ is_profile = false allow_inline = false rpc_call_channel = RPC_CHANNEL_TCP rpc_call_header_format = NET_HDR_DSN -fast_execution_in_network_thread = false rpc_timeout_milliseconds = 5000 [replication] diff --git a/src/test/kill_test/config.ini b/src/test/kill_test/config.ini index 923d118c7d..28f1a3ffd9 100644 --- a/src/test/kill_test/config.ini +++ b/src/test/kill_test/config.ini @@ -61,7 +61,6 @@ is_profile = false allow_inline = false rpc_call_channel = RPC_CHANNEL_TCP rpc_call_header_format = NET_HDR_DSN -fast_execution_in_network_thread = false rpc_timeout_milliseconds = 5000 [pegasus.killtest] diff --git a/src/test/upgrade_test/config.ini b/src/test/upgrade_test/config.ini index dc89e5bc29..de8fdece65 100644 --- a/src/test/upgrade_test/config.ini +++ b/src/test/upgrade_test/config.ini @@ -61,7 +61,6 @@ is_profile = false allow_inline = false rpc_call_channel = RPC_CHANNEL_TCP rpc_call_header_format = NET_HDR_DSN -fast_execution_in_network_thread = false rpc_timeout_milliseconds = 5000 [pegasus.upgradetest] From 2f50c89be767e4553f7d3c6e7702345ca785b944 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sat, 15 Jun 2019 21:33:20 +0800 Subject: [PATCH 7/9] remove arcconfig --- .arcconfig | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 .arcconfig diff --git a/.arcconfig b/.arcconfig deleted file mode 100644 index 577944ead4..0000000000 --- a/.arcconfig +++ /dev/null @@ -1,4 +0,0 @@ -{ - "project_id": "Pegasus", - "conduit_uri": "https://phabricator.d.xiaomi.net" -} From 42165fb046e6606ad032ab37333dcd770015c525 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Sun, 16 Jun 2019 18:54:41 +0800 Subject: [PATCH 8/9] remove fast_run --- src/base/test/config.ini | 1 - src/geo/bench/config.ini | 1 - src/geo/test/config.ini | 1 - src/redis_protocol/proxy/config.ini | 1 - src/redis_protocol/proxy_ut/config.ini | 1 - src/sample/config.ini | 1 - src/server/test/config.ini | 1 - src/shell/config.ini | 1 - src/test/bench_test/config.ini | 1 - src/test/function_test/config.ini | 1 - src/test/kill_test/config.ini | 1 - src/test/upgrade_test/config.ini | 1 - 12 files changed, 12 deletions(-) diff --git a/src/base/test/config.ini b/src/base/test/config.ini index bfa6447978..7417f3f286 100644 --- a/src/base/test/config.ini +++ b/src/base/test/config.ini @@ -14,7 +14,6 @@ count = 1 [core] ;tool = simulator -;tool = fastrun tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector diff --git a/src/geo/bench/config.ini b/src/geo/bench/config.ini index fd527aa5d8..c9788b03c9 100644 --- a/src/geo/bench/config.ini +++ b/src/geo/bench/config.ini @@ -14,7 +14,6 @@ count = 1 [core] ;tool = simulator -;tool = fastrun tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector diff --git a/src/geo/test/config.ini b/src/geo/test/config.ini index bfa6447978..7417f3f286 100644 --- a/src/geo/test/config.ini +++ b/src/geo/test/config.ini @@ -14,7 +14,6 @@ count = 1 [core] ;tool = simulator -;tool = fastrun tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector diff --git a/src/redis_protocol/proxy/config.ini b/src/redis_protocol/proxy/config.ini index 70e5507472..48fd05525d 100644 --- a/src/redis_protocol/proxy/config.ini +++ b/src/redis_protocol/proxy/config.ini @@ -24,7 +24,6 @@ delay_seconds = 30 [core] ;tool = simulator -;tool = fastrun tool = nativerun toollets = profiler ;toollets = tracer, profiler, fault_injector diff --git a/src/redis_protocol/proxy_ut/config.ini b/src/redis_protocol/proxy_ut/config.ini index cc3cded232..106832a046 100644 --- a/src/redis_protocol/proxy_ut/config.ini +++ b/src/redis_protocol/proxy_ut/config.ini @@ -24,7 +24,6 @@ delay_seconds = 30 [core] ;tool = simulator -;tool = fastrun tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector diff --git a/src/sample/config.ini b/src/sample/config.ini index 43c25b9f7c..cfc37bed42 100644 --- a/src/sample/config.ini +++ b/src/sample/config.ini @@ -14,7 +14,6 @@ count = 1 [core] ;tool = simulator -;tool = fastrun tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector diff --git a/src/server/test/config.ini b/src/server/test/config.ini index efe45e1ffe..16dc87a069 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -16,7 +16,6 @@ count = 1 [core] ;tool = simulator -;tool = fastrun tool = nativerun toollets = profiler ;toollets = tracer, profiler, fault_injector diff --git a/src/shell/config.ini b/src/shell/config.ini index e8f9787ab8..40281a6cc0 100644 --- a/src/shell/config.ini +++ b/src/shell/config.ini @@ -14,7 +14,6 @@ count = 1 [core] ;tool = simulator -;tool = fastrun tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector diff --git a/src/test/bench_test/config.ini b/src/test/bench_test/config.ini index 3c16d4d2f0..19ee0d8485 100644 --- a/src/test/bench_test/config.ini +++ b/src/test/bench_test/config.ini @@ -14,7 +14,6 @@ count = 1 [core] ;tool = simulator -;tool = fastrun tool = nativerun ;toollets = tracer ;toollets = tracer, profiler, fault_injector diff --git a/src/test/function_test/config.ini b/src/test/function_test/config.ini index 645343d0fa..9c0cf597bd 100644 --- a/src/test/function_test/config.ini +++ b/src/test/function_test/config.ini @@ -16,7 +16,6 @@ count = 1 [core] ;tool = simulator tool = nativerun -;tool = fastrun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false diff --git a/src/test/kill_test/config.ini b/src/test/kill_test/config.ini index 28f1a3ffd9..096ab89c45 100644 --- a/src/test/kill_test/config.ini +++ b/src/test/kill_test/config.ini @@ -16,7 +16,6 @@ count = 1 [core] ;tool = simulator tool = nativerun -;tool = fastrun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false diff --git a/src/test/upgrade_test/config.ini b/src/test/upgrade_test/config.ini index de8fdece65..7413a275b7 100644 --- a/src/test/upgrade_test/config.ini +++ b/src/test/upgrade_test/config.ini @@ -16,7 +16,6 @@ count = 1 [core] ;tool = simulator tool = nativerun -;tool = fastrun ;toollets = tracer ;toollets = tracer, profiler, fault_injector pause_on_start = false From ca75e6a67d750da0c62cad291cd4cc5e4193f101 Mon Sep 17 00:00:00 2001 From: neverchanje Date: Mon, 17 Jun 2019 14:03:53 +0800 Subject: [PATCH 9/9] fix update_rdb_stat_interval --- src/server/config.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/config.ini b/src/server/config.ini index 1ce8ab2114..b6da43efe8 100644 --- a/src/server/config.ini +++ b/src/server/config.ini @@ -268,6 +268,7 @@ checkpoint_reserve_min_count = 2 checkpoint_reserve_time_seconds = 1800 + update_rdb_stat_interval = 600 manual_compact_min_interval_seconds = 600