From 3e36882a7f41c7524fec3d7ed57e7086302c2a74 Mon Sep 17 00:00:00 2001 From: levy Date: Wed, 17 Mar 2021 10:38:40 +0800 Subject: [PATCH 1/2] refactor: delete unused config aio_factory_name --- rdsn | 2 +- 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/test/config.ini | 1 - 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/pressure_test/config-pressure.ini | 1 - src/test/upgrade_test/config.ini | 2 -- 14 files changed, 1 insertion(+), 25 deletions(-) diff --git a/rdsn b/rdsn index c057d35c93..2ebdfcec6f 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit c057d35c93ff9d895d5eefef343b6c7afd74812d +Subproject commit 2ebdfcec6f838cb0149e30e5c175fe51cc50daa8 diff --git a/src/base/test/config.ini b/src/base/test/config.ini index 7417f3f286..b6b37b3981 100644 --- a/src/base/test/config.ini +++ b/src/base/test/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/geo/bench/config.ini b/src/geo/bench/config.ini index 556e177f0f..fd14ff1845 100644 --- a/src/geo/bench/config.ini +++ b/src/geo/bench/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/geo/test/config.ini b/src/geo/test/config.ini index cfc37bed42..aa6c2a7b6c 100644 --- a/src/geo/test/config.ini +++ b/src/geo/test/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/redis_protocol/proxy/config.ini b/src/redis_protocol/proxy/config.ini index 120c15fb65..0ef4b3990a 100644 --- a/src/redis_protocol/proxy/config.ini +++ b/src/redis_protocol/proxy/config.ini @@ -29,8 +29,6 @@ toollets = profiler ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/redis_protocol/proxy_ut/config.ini b/src/redis_protocol/proxy_ut/config.ini index 5ad1dd5ed2..b9bb4cdba1 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, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/sample/config.ini b/src/sample/config.ini index cfc37bed42..aa6c2a7b6c 100644 --- a/src/sample/config.ini +++ b/src/sample/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/server/test/config.ini b/src/server/test/config.ini index 2f8d405ce8..3835520d0a 100644 --- a/src/server/test/config.ini +++ b/src/server/test/config.ini @@ -20,7 +20,6 @@ tool = nativerun toollets = profiler ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/shell/config.ini b/src/shell/config.ini index 40281a6cc0..62a649ff30 100644 --- a/src/shell/config.ini +++ b/src/shell/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/test/bench_test/config.ini b/src/test/bench_test/config.ini index 4c443855bb..bf3ed4c2b4 100644 --- a/src/test/bench_test/config.ini +++ b/src/test/bench_test/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/test/function_test/config.ini b/src/test/function_test/config.ini index 9c0cf597bd..158992fadb 100644 --- a/src/test/function_test/config.ini +++ b/src/test/function_test/config.ini @@ -20,8 +20,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG 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 096ab89c45..86acc7260a 100644 --- a/src/test/kill_test/config.ini +++ b/src/test/kill_test/config.ini @@ -20,8 +20,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger diff --git a/src/test/pressure_test/config-pressure.ini b/src/test/pressure_test/config-pressure.ini index 5d2e894543..eac6dae91d 100644 --- a/src/test/pressure_test/config-pressure.ini +++ b/src/test/pressure_test/config-pressure.ini @@ -23,7 +23,6 @@ pause_on_start = false cli_local = false cli_remote = false -;aio_factory_name = dsn::tools::native_aio_provider start_nfs = false logging_start_level = LOG_LEVEL_DEBUG diff --git a/src/test/upgrade_test/config.ini b/src/test/upgrade_test/config.ini index 7413a275b7..6be982566b 100644 --- a/src/test/upgrade_test/config.ini +++ b/src/test/upgrade_test/config.ini @@ -20,8 +20,6 @@ tool = nativerun ;toollets = tracer, profiler, fault_injector pause_on_start = false -;aio_factory_name = dsn::tools::native_aio_provider - logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger ;logging_factory_name = dsn::tools::screen_logger From 87f878bbe42c25804fdebb4f1a92dad7dcee61c3 Mon Sep 17 00:00:00 2001 From: levy Date: Thu, 18 Mar 2021 11:12:12 +0800 Subject: [PATCH 2/2] update rdsn --- rdsn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdsn b/rdsn index e2bf7c740b..140548388e 160000 --- a/rdsn +++ b/rdsn @@ -1 +1 @@ -Subproject commit e2bf7c740b93cc4a59769b6dc888609f36871b67 +Subproject commit 140548388e62700b3f018c9f6ccaf2f0b396df35