From a25bc1c0b6ed761195dd87f56828c59d33d55479 Mon Sep 17 00:00:00 2001 From: WeijieSun Date: Thu, 13 Sep 2018 10:55:02 +0800 Subject: [PATCH] cli: refactor cli related code (#156) --- bin/dsn.cmake | 1 + compile_thrift.py | 8 +- include/dsn/cpp/message_utils.h | 6 +- include/dsn/{tool => dist}/cli/cli.client.h | 3 +- .../{tool => dist}/cli/cli.code.definition.h | 2 - include/dsn/dist/cli/cli.server.h | 60 +++++++ include/dsn/{tool => dist}/cli/cli.types.h | 4 +- include/dsn/{tool => dist}/cli/cli_types.h | 0 include/dsn/tool-api/command_manager.h | 10 +- include/dsn/tool/cli.h | 5 - src/apps/CMakeLists.txt | 1 - src/apps/cli/cli_types.cpp | 153 ------------------ src/apps/echo/config.ini | 4 - src/core/core/CMakeLists.txt | 4 - src/core/core/command_manager.cpp | 91 +---------- src/core/core/service_api_c.cpp | 8 - src/core/core/service_engine.cpp | 25 +-- src/core/core/service_engine.h | 8 +- src/core/core/task_spec.cpp | 1 + src/core/tests/command_manager.cpp | 72 --------- .../tests/config-test-corrupt-message.ini | 2 - src/core/tests/config-test-posix-aio.ini | 2 - src/core/tests/config-test-sim.ini | 2 - src/core/tests/config-test.ini | 2 - src/dist/CMakeLists.txt | 1 + src/{apps => dist}/cli/CMakeLists.txt | 4 +- src/{apps => dist}/cli/cli.thrift | 1 + src/dist/cli/cli_server_impl.cpp | 21 +++ src/dist/cli/cli_types.cpp | 151 +++++++++++++++++ .../cli => dist/cli/shell}/CMakeLists.txt | 6 +- .../cli => dist/cli/shell}/cli.main.cpp | 0 src/{tools/cli => dist/cli/shell}/cli_app.cpp | 0 src/{tools/cli => dist/cli/shell}/cli_app.h | 2 +- src/{tools/cli => dist/cli/shell}/config.ini | 1 - src/dist/nfs/test/config.ini | 2 - src/dist/replication/lib/CMakeLists.txt | 1 + src/dist/replication/lib/replica_stub.cpp | 4 + src/dist/replication/lib/replica_stub.h | 4 + .../replication/meta_server/CMakeLists.txt | 1 + .../replication/meta_server/meta_service.cpp | 5 + .../replication/meta_server/meta_service.h | 4 + .../test/meta_test/unit_test/CMakeLists.txt | 1 + .../meta_test/unit_test/config-ddl-test.ini | 2 - .../test/meta_test/unit_test/config-test.ini | 2 - .../replica_test/unit_test/config-test.ini | 2 - .../replication/test/simple_kv/case-000.ini | 2 - .../replication/test/simple_kv/case-001.ini | 2 - .../replication/test/simple_kv/case-002.ini | 2 - .../replication/test/simple_kv/case-003.ini | 2 - .../replication/test/simple_kv/case-004.ini | 2 - .../replication/test/simple_kv/case-005.ini | 2 - .../replication/test/simple_kv/case-006.ini | 2 - .../replication/test/simple_kv/case-100.ini | 2 - .../replication/test/simple_kv/case-101.ini | 2 - .../replication/test/simple_kv/case-102.ini | 2 - .../replication/test/simple_kv/case-103.ini | 2 - .../replication/test/simple_kv/case-104.ini | 2 - .../replication/test/simple_kv/case-105.ini | 2 - .../replication/test/simple_kv/case-106.ini | 2 - .../replication/test/simple_kv/case-107.ini | 2 - .../replication/test/simple_kv/case-108.ini | 2 - .../replication/test/simple_kv/case-109.ini | 2 - .../replication/test/simple_kv/case-200.ini | 2 - .../replication/test/simple_kv/case-201.ini | 2 - .../replication/test/simple_kv/case-202-0.ini | 2 - .../replication/test/simple_kv/case-202-1.ini | 2 - .../replication/test/simple_kv/case-203-0.ini | 2 - .../replication/test/simple_kv/case-203-1.ini | 2 - .../replication/test/simple_kv/case-204.ini | 2 - .../replication/test/simple_kv/case-205.ini | 2 - .../replication/test/simple_kv/case-206.ini | 2 - .../replication/test/simple_kv/case-207.ini | 2 - .../replication/test/simple_kv/case-208.ini | 2 - .../replication/test/simple_kv/case-209.ini | 2 - .../replication/test/simple_kv/case-210.ini | 2 - .../replication/test/simple_kv/case-211.ini | 2 - .../replication/test/simple_kv/case-212.ini | 2 - .../replication/test/simple_kv/case-213.ini | 2 - .../replication/test/simple_kv/case-214.ini | 2 - .../replication/test/simple_kv/case-215.ini | 2 - .../replication/test/simple_kv/case-216.ini | 2 - .../replication/test/simple_kv/case-300-0.ini | 2 - .../replication/test/simple_kv/case-300-1.ini | 2 - .../replication/test/simple_kv/case-300-2.ini | 2 - .../replication/test/simple_kv/case-301.ini | 2 - .../replication/test/simple_kv/case-302.ini | 2 - .../replication/test/simple_kv/case-303.ini | 2 - .../replication/test/simple_kv/case-304.ini | 2 - .../replication/test/simple_kv/case-305.ini | 2 - .../replication/test/simple_kv/case-306.ini | 2 - .../replication/test/simple_kv/case-307.ini | 2 - .../replication/test/simple_kv/case-400.ini | 2 - .../replication/test/simple_kv/case-401.ini | 2 - .../replication/test/simple_kv/case-402.ini | 2 - .../replication/test/simple_kv/case-600.ini | 2 - .../replication/test/simple_kv/case-601.ini | 2 - .../replication/test/simple_kv/case-602.ini | 2 - .../replication/test/simple_kv/case-603.ini | 2 - src/tests/dsn/config-test.ini | 2 - src/tools/CMakeLists.txt | 1 - src/tools/repli/config.ini | 2 - 101 files changed, 282 insertions(+), 518 deletions(-) rename include/dsn/{tool => dist}/cli/cli.client.h (97%) rename include/dsn/{tool => dist}/cli/cli.code.definition.h (70%) create mode 100644 include/dsn/dist/cli/cli.server.h rename include/dsn/{tool => dist}/cli/cli.types.h (79%) rename include/dsn/{tool => dist}/cli/cli_types.h (100%) delete mode 100644 include/dsn/tool/cli.h delete mode 100644 src/apps/cli/cli_types.cpp rename src/{apps => dist}/cli/CMakeLists.txt (89%) rename src/{apps => dist}/cli/cli.thrift (75%) create mode 100644 src/dist/cli/cli_server_impl.cpp create mode 100644 src/dist/cli/cli_types.cpp rename src/{tools/cli => dist/cli/shell}/CMakeLists.txt (86%) rename src/{tools/cli => dist/cli/shell}/cli.main.cpp (100%) rename src/{tools/cli => dist/cli/shell}/cli_app.cpp (100%) rename src/{tools/cli => dist/cli/shell}/cli_app.h (97%) rename src/{tools/cli => dist/cli/shell}/config.ini (98%) diff --git a/bin/dsn.cmake b/bin/dsn.cmake index 8f9cc0891e..4b4f26fa16 100644 --- a/bin/dsn.cmake +++ b/bin/dsn.cmake @@ -282,6 +282,7 @@ function(dsn_setup_compiler_flags) add_compile_options(-Wno-unused-variable) add_compile_options(-Wno-deprecated-declarations) add_compile_options(-Wno-inconsistent-missing-override) + add_compile_options(-Wno-attributes) find_program(CCACHE_FOUND ccache) if(CCACHE_FOUND) diff --git a/compile_thrift.py b/compile_thrift.py index 7a1b09e377..8e9c0038b0 100755 --- a/compile_thrift.py +++ b/compile_thrift.py @@ -100,20 +100,20 @@ }, { "name": "cli", - "path": "src/apps/cli", + "path": "src/dist/cli", "file_move": { - ".types.h _types.h": "include/dsn/tool/cli" + ".types.h _types.h": "include/dsn/dist/cli" }, "include_fix": { "_types.h": { "remove": ["\"dsn_types.h\""] }, "_types.cpp": { - "add": [""], + "add": [""], "remove": ["\"cli_types.h\""] }, ".types.h": { - "add": [""], + "add": [""], "remove": ["\"cli_types.h\""] } } diff --git a/include/dsn/cpp/message_utils.h b/include/dsn/cpp/message_utils.h index 97d59082eb..a80b042621 100644 --- a/include/dsn/cpp/message_utils.h +++ b/include/dsn/cpp/message_utils.h @@ -26,8 +26,12 @@ #pragma once -#include #include +#include +#include +#include +#include +#include namespace dsn { diff --git a/include/dsn/tool/cli/cli.client.h b/include/dsn/dist/cli/cli.client.h similarity index 97% rename from include/dsn/tool/cli/cli.client.h rename to include/dsn/dist/cli/cli.client.h index a46860b11b..bfbb0cce70 100644 --- a/include/dsn/tool/cli/cli.client.h +++ b/include/dsn/dist/cli/cli.client.h @@ -37,7 +37,8 @@ #include #include #include -#include +#include +#include #include namespace dsn { diff --git a/include/dsn/tool/cli/cli.code.definition.h b/include/dsn/dist/cli/cli.code.definition.h similarity index 70% rename from include/dsn/tool/cli/cli.code.definition.h rename to include/dsn/dist/cli/cli.code.definition.h index ca5679f7a3..27278b271f 100644 --- a/include/dsn/tool/cli/cli.code.definition.h +++ b/include/dsn/dist/cli/cli.code.definition.h @@ -5,6 +5,4 @@ namespace dsn { // define your own thread pool using DEFINE_THREAD_POOL_CODE(xxx) // define RPC task code for service 'cli' DEFINE_TASK_CODE_RPC(RPC_CLI_CLI_CALL, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT) -// test timer task code -DEFINE_TASK_CODE(LPC_CLI_TEST_TIMER, TASK_PRIORITY_COMMON, ::dsn::THREAD_POOL_DEFAULT) } diff --git a/include/dsn/dist/cli/cli.server.h b/include/dsn/dist/cli/cli.server.h new file mode 100644 index 0000000000..5c026b5948 --- /dev/null +++ b/include/dsn/dist/cli/cli.server.h @@ -0,0 +1,60 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2015 Microsoft Corporation + * + * -=- Robust Distributed System Nucleus (rDSN) -=- + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#pragma once +#include +#include +#include +#include + +namespace dsn { +class cli_service : public ::dsn::serverlet +{ +public: + static std::unique_ptr create_service(); + +public: + cli_service() : ::dsn::serverlet("cli") {} + virtual ~cli_service() {} + +protected: + // all service handlers to be implemented further + // RPC_CLI_CLI_CALL + virtual void on_call(const command &request, ::dsn::rpc_replier &reply) + { + std::cout << "... exec RPC_CLI_CLI_CALL ... (not implemented) " << std::endl; + std::string resp; + reply(resp); + } + +public: + void open_service() + { + this->register_async_rpc_handler(RPC_CLI_CLI_CALL, "call", &cli_service::on_call); + } + void close_service() { this->unregister_rpc_handler(RPC_CLI_CLI_CALL); } +}; +} diff --git a/include/dsn/tool/cli/cli.types.h b/include/dsn/dist/cli/cli.types.h similarity index 79% rename from include/dsn/tool/cli/cli.types.h rename to include/dsn/dist/cli/cli.types.h index c2d784ca2a..717880883f 100644 --- a/include/dsn/tool/cli/cli.types.h +++ b/include/dsn/dist/cli/cli.types.h @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include @@ -9,4 +9,4 @@ namespace dsn { GENERATED_TYPE_SERIALIZATION(command, THRIFT) -} \ No newline at end of file +} diff --git a/include/dsn/tool/cli/cli_types.h b/include/dsn/dist/cli/cli_types.h similarity index 100% rename from include/dsn/tool/cli/cli_types.h rename to include/dsn/dist/cli/cli_types.h diff --git a/include/dsn/tool-api/command_manager.h b/include/dsn/tool-api/command_manager.h index 7d594fb5ac..e2ce171c22 100644 --- a/include/dsn/tool-api/command_manager.h +++ b/include/dsn/tool-api/command_manager.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include namespace dsn { @@ -48,13 +48,6 @@ class command_manager : public ::dsn::utils::singleton const std::string &help_long, command_handler handler); void deregister_command(dsn_handle_t handle); - - bool run_command(const std::string &cmdline, /*out*/ std::string &output); - void start_remote_cli(); - void on_remote_cli(dsn::message_ex* req); - void set_cli_target_address(dsn_handle_t handle, dsn::rpc_address address); - -private: bool run_command(const std::string &cmd, const std::vector &args, /*out*/ std::string &output); @@ -62,7 +55,6 @@ class command_manager : public ::dsn::utils::singleton private: struct command_instance { - dsn::rpc_address address; std::vector commands; std::string help_short; std::string help_long; diff --git a/include/dsn/tool/cli.h b/include/dsn/tool/cli.h deleted file mode 100644 index c28778ea0f..0000000000 --- a/include/dsn/tool/cli.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include -#include -#include diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index 9cf1dd7d87..a4f7dd989c 100644 --- a/src/apps/CMakeLists.txt +++ b/src/apps/CMakeLists.txt @@ -1,3 +1,2 @@ add_subdirectory(echo) add_subdirectory(skv) -add_subdirectory(cli) diff --git a/src/apps/cli/cli_types.cpp b/src/apps/cli/cli_types.cpp deleted file mode 100644 index bd1c5a140b..0000000000 --- a/src/apps/cli/cli_types.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/** - * Autogenerated by Thrift Compiler (0.9.3) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -#include - -#include -#include - -#include - -namespace dsn { - - -command::~command() throw() { -} - - -void command::__set_cmd(const std::string& val) { - this->cmd = val; -} - -void command::__set_arguments(const std::vector & val) { - this->arguments = val; -} - -uint32_t command::read(::apache::thrift::protocol::TProtocol* iprot) { - - apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); - uint32_t xfer = 0; - std::string fname; - ::apache::thrift::protocol::TType ftype; - int16_t fid; - - xfer += iprot->readStructBegin(fname); - - using ::apache::thrift::protocol::TProtocolException; - - - while (true) - { - xfer += iprot->readFieldBegin(fname, ftype, fid); - if (ftype == ::apache::thrift::protocol::T_STOP) { - break; - } - switch (fid) - { - case 1: - if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->cmd); - this->__isset.cmd = true; - } else { - xfer += iprot->skip(ftype); - } - break; - case 2: - if (ftype == ::apache::thrift::protocol::T_LIST) { - { - this->arguments.clear(); - uint32_t _size0; - ::apache::thrift::protocol::TType _etype3; - xfer += iprot->readListBegin(_etype3, _size0); - this->arguments.resize(_size0); - uint32_t _i4; - for (_i4 = 0; _i4 < _size0; ++_i4) - { - xfer += iprot->readString(this->arguments[_i4]); - } - xfer += iprot->readListEnd(); - } - this->__isset.arguments = true; - } else { - xfer += iprot->skip(ftype); - } - break; - default: - xfer += iprot->skip(ftype); - break; - } - xfer += iprot->readFieldEnd(); - } - - xfer += iprot->readStructEnd(); - - return xfer; -} - -uint32_t command::write(::apache::thrift::protocol::TProtocol* oprot) const { - uint32_t xfer = 0; - apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); - xfer += oprot->writeStructBegin("command"); - - xfer += oprot->writeFieldBegin("cmd", ::apache::thrift::protocol::T_STRING, 1); - xfer += oprot->writeString(this->cmd); - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldBegin("arguments", ::apache::thrift::protocol::T_LIST, 2); - { - xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast(this->arguments.size())); - std::vector ::const_iterator _iter5; - for (_iter5 = this->arguments.begin(); _iter5 != this->arguments.end(); ++_iter5) - { - xfer += oprot->writeString((*_iter5)); - } - xfer += oprot->writeListEnd(); - } - xfer += oprot->writeFieldEnd(); - - xfer += oprot->writeFieldStop(); - xfer += oprot->writeStructEnd(); - return xfer; -} - -void swap(command &a, command &b) { - using ::std::swap; - swap(a.cmd, b.cmd); - swap(a.arguments, b.arguments); - swap(a.__isset, b.__isset); -} - -command::command(const command& other6) { - cmd = other6.cmd; - arguments = other6.arguments; - __isset = other6.__isset; -} -command::command( command&& other7) { - cmd = std::move(other7.cmd); - arguments = std::move(other7.arguments); - __isset = std::move(other7.__isset); -} -command& command::operator=(const command& other8) { - cmd = other8.cmd; - arguments = other8.arguments; - __isset = other8.__isset; - return *this; -} -command& command::operator=(command&& other9) { - cmd = std::move(other9.cmd); - arguments = std::move(other9.arguments); - __isset = std::move(other9.__isset); - return *this; -} -void command::printTo(std::ostream& out) const { - using ::apache::thrift::to_string; - out << "command("; - out << "cmd=" << to_string(cmd); - out << ", " << "arguments=" << to_string(arguments); - out << ")"; -} - -} // namespace diff --git a/src/apps/echo/config.ini b/src/apps/echo/config.ini index 95d1134f8e..e001000b05 100644 --- a/src/apps/echo/config.ini +++ b/src/apps/echo/config.ini @@ -83,11 +83,7 @@ aio_aspects = ; asynchonous file system provider aio_factory_name = -; whether to enable local command line interface (cli) -cli_local = false -; whether to enable remote command line interface (using dsn.cli) -cli_remote = false ; where to put the core dump files coredump_dir = ./coredump diff --git a/src/core/core/CMakeLists.txt b/src/core/core/CMakeLists.txt index 85474d13ba..745dffd5b4 100644 --- a/src/core/core/CMakeLists.txt +++ b/src/core/core/CMakeLists.txt @@ -1,9 +1,5 @@ set(MY_PROJ_NAME dsn.core) -# Source files under CURRENT project directory will be automatically included. -# You can manually set MY_PROJ_SRC to include source files under other directories. -set(MY_PROJ_SRC "../../apps/cli/cli_types.cpp") - # Search mode for source files under CURRENT project directory? # "GLOB_RECURSE" for recursive search # "GLOB" for non-recursive search diff --git a/src/core/core/command_manager.cpp b/src/core/core/command_manager.cpp index 91dd3c15a6..ec99bc3389 100644 --- a/src/core/core/command_manager.cpp +++ b/src/core/core/command_manager.cpp @@ -38,15 +38,8 @@ #include #include -#include #include -#include -#include #include -#include - -#include "service_engine.h" -#include "rpc_engine.h" namespace dsn { @@ -80,7 +73,6 @@ dsn_handle_t command_manager::register_command(const std::vector &c } command_instance *c = new command_instance(); - c->address.set_invalid(); c->commands = commands; c->help_long = help_long; c->help_short = help_one_line; @@ -108,30 +100,6 @@ void command_manager::deregister_command(dsn_handle_t handle) delete c; } -bool command_manager::run_command(const std::string &cmdline, /*out*/ std::string &output) -{ - auto cnode = ::dsn::task::get_current_node2(); - if (cnode == nullptr) { - auto &all_nodes = ::dsn::service_engine::fast_instance().get_all_nodes(); - dassert(!all_nodes.empty(), "no node to mimic!"); - dsn_mimic_app(all_nodes.begin()->second->spec().role_name.c_str(), 1); - } - std::string scmd = cmdline; - std::vector args; - - utils::split_args(scmd.c_str(), args, ' '); - - if (args.size() < 1) - return false; - - std::vector args2; - for (size_t i = 1; i < args.size(); i++) { - args2.push_back(args[i]); - } - - return run_command(args[0], args2, output); -} - bool command_manager::run_command(const std::string &cmd, const std::vector &args, /*out*/ std::string &output) @@ -148,66 +116,11 @@ bool command_manager::run_command(const std::string &cmd, output = std::string("unknown command '") + cmd + "'"; return false; } else { - if (h->address.is_invalid() || - h->address == dsn::task::get_current_rpc()->primary_address()) { - output = h->handler(args); - return true; - } else { - ::dsn::rpc_read_stream response; - - dsn::message_ex *msg = dsn::message_ex::create_request(RPC_CLI_CLI_CALL); - ::dsn::command rcmd; - rcmd.cmd = cmd; - rcmd.arguments = args; - ::dsn::marshall(msg, rcmd); - auto resp = dsn_rpc_call_wait(h->address, msg); - if (resp != nullptr) { - ::dsn::unmarshall(resp, output); - return true; - } else { - dwarn("cli run for %s is too long, timeout", cmd.c_str()); - return false; - } - } + output = h->handler(args); + return true; } } -void command_manager::start_remote_cli() -{ - ::dsn::service_engine::fast_instance().register_system_rpc_handler( - RPC_CLI_CLI_CALL, "dsn.cli", [](dsn::message_ex *req) { - command_manager::instance().on_remote_cli(req); - }); -} - -void command_manager::on_remote_cli(dsn::message_ex *req) -{ - ::dsn::command cmd; - std::string result; - - ::dsn::unmarshall(req, cmd); - - std::ostringstream oss; - for (int i = 0; i < cmd.arguments.size(); i++) { - oss << " \"" << cmd.arguments[i] << "\""; - } - ddebug("received remote command from %s: %s%s", - req->header->from_address.to_string(), - cmd.cmd.c_str(), - oss.str().c_str()); - - run_command(cmd.cmd, cmd.arguments, result); - - auto resp = req->create_response(); - ::dsn::marshall(resp, result); - dsn_rpc_reply(resp); -} - -void command_manager::set_cli_target_address(dsn_handle_t handle, dsn::rpc_address address) -{ - reinterpret_cast(handle)->address = address; -} - command_manager::command_manager() { register_command({"help", "h", "H", "Help"}, diff --git a/src/core/core/service_api_c.cpp b/src/core/core/service_api_c.cpp index 430ba1d717..47cfae8af0 100644 --- a/src/core/core/service_api_c.cpp +++ b/src/core/core/service_api_c.cpp @@ -679,14 +679,6 @@ bool run(const char *config_file, exit(1); } - if (dsn_config_get_value_bool( - "core", - "cli_remote", - true, - "whether to enable remote command line interface (using dsn.cli)")) { - ::dsn::command_manager::instance().start_remote_cli(); - } - dsn::command_manager::instance().register_command({"config-dump"}, "config-dump - dump configuration", "config-dump [to-this-config-file]", diff --git a/src/core/core/service_engine.cpp b/src/core/core/service_engine.cpp index 1aff2ed99a..c22b1c7c7c 100644 --- a/src/core/core/service_engine.cpp +++ b/src/core/core/service_engine.cpp @@ -37,10 +37,10 @@ #include "task_engine.h" #include "disk_engine.h" #include "rpc_engine.h" -#include -#include #include #include +#include +#include #include #include #include @@ -257,27 +257,6 @@ void service_engine::init_after_toollets() tls_dsn.env = _env; } -// port == -1 for all node -void service_engine::register_system_rpc_handler(dsn::task_code code, - const char *name, - const rpc_request_handler &cb, - int port /*= -1*/ - ) -{ - if (port == -1) { - for (auto &n : _nodes_by_app_id) { - n.second->rpc_register_handler(code, name, cb); - } - } else { - auto it = _nodes_by_app_port.find(port); - if (it != _nodes_by_app_port.end()) { - it->second->rpc_register_handler(code, name, cb); - } else { - dwarn("cannot find service node with port %d", port); - } - } -} - service_node *service_engine::start_node(service_app_spec &app_spec) { auto it = _nodes_by_app_id.find(app_spec.id); diff --git a/src/core/core/service_engine.h b/src/core/core/service_engine.h index 80978ca157..45b7d1453c 100644 --- a/src/core/core/service_engine.h +++ b/src/core/core/service_engine.h @@ -39,11 +39,11 @@ #include #include +#include #include #include #include #include -#include namespace dsn { @@ -134,12 +134,6 @@ class service_engine : public utils::singleton void init_after_toollets(); service_node *start_node(service_app_spec &app_spec); - - // port == -1 for all nodes - void register_system_rpc_handler(dsn::task_code code, - const char *name, - const rpc_request_handler &cb, - int port = -1); const service_nodes_by_app_id &get_all_nodes() const { return _nodes_by_app_id; } private: diff --git a/src/core/core/task_spec.cpp b/src/core/core/task_spec.cpp index 12755014cc..4de6979a43 100644 --- a/src/core/core/task_spec.cpp +++ b/src/core/core/task_spec.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/src/core/tests/command_manager.cpp b/src/core/tests/command_manager.cpp index dddce3760e..1bcb427ed6 100644 --- a/src/core/tests/command_manager.cpp +++ b/src/core/tests/command_manager.cpp @@ -33,7 +33,6 @@ * xxxx-xx-xx, author, fix bug about xxx */ -#include #include #include @@ -57,74 +56,3 @@ void command_manager_module_init() return ss.str(); }); } - -/* -TEST(core, command_manager) -{ - cli_client cli(rpc_address("localhost", 20101)); - - error_code err; - std::string result; - command rcmd; - - rcmd.cmd = "help"; - rcmd.arguments.clear(); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10)); - ASSERT_EQ(ERR_OK, err); - - rcmd.cmd = "help"; - rcmd.arguments.clear(); - rcmd.arguments.push_back("engine"); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10)); - ASSERT_EQ(ERR_OK, err); - - rcmd.cmd = "help"; - rcmd.arguments.clear(); - rcmd.arguments.push_back("unexist-cmd"); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10)); - ASSERT_EQ(ERR_OK, err); - ASSERT_EQ("cannot find command 'unexist-cmd'", result); - - rcmd.cmd = "engine"; - rcmd.arguments.clear(); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10)); - ASSERT_EQ(ERR_OK, err); - - rcmd.cmd = "task-code"; - rcmd.arguments.clear(); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10)); - ASSERT_EQ(ERR_OK, err); - - rcmd.cmd = "test-cmd"; - rcmd.arguments.clear(); - rcmd.arguments.push_back("this"); - rcmd.arguments.push_back("is"); - rcmd.arguments.push_back("test"); - rcmd.arguments.push_back("argument"); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10)); - ASSERT_EQ(ERR_OK, err); - ASSERT_EQ("test-cmd response: [this is test argument]", result); - - rcmd.cmd = "unexist-cmd"; - rcmd.arguments.clear(); - rcmd.arguments.push_back("arg1"); - rcmd.arguments.push_back("arg2"); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10)); - ASSERT_EQ(ERR_OK, err); - ASSERT_EQ("unknown command 'unexist-cmd'", result); - - rcmd.cmd = "help"; - rcmd.arguments.clear(); - rpc_address addr("localhost", 20109); - result.clear(); - std::tie(err, result) = cli.call_sync(rcmd, std::chrono::seconds(10), 0, 0, addr); - ASSERT_TRUE(err == ERR_TIMEOUT || err == ERR_NETWORK_FAILURE); -} -*/ diff --git a/src/core/tests/config-test-corrupt-message.ini b/src/core/tests/config-test-corrupt-message.ini index a443f56d0d..4c5ac19721 100644 --- a/src/core/tests/config-test-corrupt-message.ini +++ b/src/core/tests/config-test-corrupt-message.ini @@ -33,8 +33,6 @@ tool = nativerun toollets = fault_injector pause_on_start = false -cli_local = true -cli_remote = true logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/core/tests/config-test-posix-aio.ini b/src/core/tests/config-test-posix-aio.ini index 5de0c7ca92..84942ffdc2 100644 --- a/src/core/tests/config-test-posix-aio.ini +++ b/src/core/tests/config-test-posix-aio.ini @@ -20,8 +20,6 @@ tool = nativerun toollets = tracer, profiler pause_on_start = false -cli_local = true -cli_remote = true logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/core/tests/config-test-sim.ini b/src/core/tests/config-test-sim.ini index da9a7d1dca..9f50d93ea4 100644 --- a/src/core/tests/config-test-sim.ini +++ b/src/core/tests/config-test-sim.ini @@ -36,8 +36,6 @@ tool = simulator toollets = tracer, profiler pause_on_start = false -cli_local = true -cli_remote = true logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/core/tests/config-test.ini b/src/core/tests/config-test.ini index e9908cd777..ea6b5a6672 100644 --- a/src/core/tests/config-test.ini +++ b/src/core/tests/config-test.ini @@ -49,8 +49,6 @@ tool = nativerun toollets = tracer, profiler pause_on_start = false -cli_local = true -cli_remote = true logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/CMakeLists.txt b/src/dist/CMakeLists.txt index d5cec7d410..41f8035adb 100644 --- a/src/dist/CMakeLists.txt +++ b/src/dist/CMakeLists.txt @@ -3,3 +3,4 @@ add_subdirectory(replication) add_subdirectory(failure_detector_multimaster) add_subdirectory(block_service) add_subdirectory(nfs) +add_subdirectory(cli) diff --git a/src/apps/cli/CMakeLists.txt b/src/dist/cli/CMakeLists.txt similarity index 89% rename from src/apps/cli/CMakeLists.txt rename to src/dist/cli/CMakeLists.txt index cad78b07b2..9a22c2ecfe 100644 --- a/src/apps/cli/CMakeLists.txt +++ b/src/dist/cli/CMakeLists.txt @@ -1,4 +1,4 @@ -set(MY_PROJ_NAME dsn.cli) +set(MY_PROJ_NAME dsn_cli) # Source files under CURRENT project directory will be automatically included. # You can manually set MY_PROJ_SRC to include source files under other directories. @@ -14,3 +14,5 @@ set(MY_PROJ_INC_PATH "") set(MY_PROJ_LIB_PATH "") dsn_add_static_library() + +add_subdirectory(shell) diff --git a/src/apps/cli/cli.thrift b/src/dist/cli/cli.thrift similarity index 75% rename from src/apps/cli/cli.thrift rename to src/dist/cli/cli.thrift index 2020844e0b..493dc7511d 100644 --- a/src/apps/cli/cli.thrift +++ b/src/dist/cli/cli.thrift @@ -1,3 +1,4 @@ +// TODO: move this to dsn.service namespace namespace cpp dsn struct command diff --git a/src/dist/cli/cli_server_impl.cpp b/src/dist/cli/cli_server_impl.cpp new file mode 100644 index 0000000000..dc8fe25052 --- /dev/null +++ b/src/dist/cli/cli_server_impl.cpp @@ -0,0 +1,21 @@ +#include +#include +#include + +namespace dsn { +class cli_service_impl : public cli_service +{ +public: + void on_call(const command &request, ::dsn::rpc_replier &reply) override + { + std::string output; + dsn::command_manager::instance().run_command(request.cmd, request.arguments, output); + reply(output); + } +}; + +std::unique_ptr cli_service::create_service() +{ + return dsn::make_unique(); +} +} diff --git a/src/dist/cli/cli_types.cpp b/src/dist/cli/cli_types.cpp new file mode 100644 index 0000000000..846b5ebadc --- /dev/null +++ b/src/dist/cli/cli_types.cpp @@ -0,0 +1,151 @@ +/** + * Autogenerated by Thrift Compiler (0.9.3) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +#include + +#include +#include + +#include + +namespace dsn { + +command::~command() throw() {} + +void command::__set_cmd(const std::string &val) { this->cmd = val; } + +void command::__set_arguments(const std::vector &val) { this->arguments = val; } + +uint32_t command::read(::apache::thrift::protocol::TProtocol *iprot) +{ + + apache::thrift::protocol::TInputRecursionTracker tracker(*iprot); + uint32_t xfer = 0; + std::string fname; + ::apache::thrift::protocol::TType ftype; + int16_t fid; + + xfer += iprot->readStructBegin(fname); + + using ::apache::thrift::protocol::TProtocolException; + + while (true) { + xfer += iprot->readFieldBegin(fname, ftype, fid); + if (ftype == ::apache::thrift::protocol::T_STOP) { + break; + } + switch (fid) { + case 1: + if (ftype == ::apache::thrift::protocol::T_STRING) { + xfer += iprot->readString(this->cmd); + this->__isset.cmd = true; + } else { + xfer += iprot->skip(ftype); + } + break; + case 2: + if (ftype == ::apache::thrift::protocol::T_LIST) { + { + this->arguments.clear(); + uint32_t _size0; + ::apache::thrift::protocol::TType _etype3; + xfer += iprot->readListBegin(_etype3, _size0); + this->arguments.resize(_size0); + uint32_t _i4; + for (_i4 = 0; _i4 < _size0; ++_i4) { + xfer += iprot->readString(this->arguments[_i4]); + } + xfer += iprot->readListEnd(); + } + this->__isset.arguments = true; + } else { + xfer += iprot->skip(ftype); + } + break; + default: + xfer += iprot->skip(ftype); + break; + } + xfer += iprot->readFieldEnd(); + } + + xfer += iprot->readStructEnd(); + + return xfer; +} + +uint32_t command::write(::apache::thrift::protocol::TProtocol *oprot) const +{ + uint32_t xfer = 0; + apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); + xfer += oprot->writeStructBegin("command"); + + xfer += oprot->writeFieldBegin("cmd", ::apache::thrift::protocol::T_STRING, 1); + xfer += oprot->writeString(this->cmd); + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldBegin("arguments", ::apache::thrift::protocol::T_LIST, 2); + { + xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, + static_cast(this->arguments.size())); + std::vector::const_iterator _iter5; + for (_iter5 = this->arguments.begin(); _iter5 != this->arguments.end(); ++_iter5) { + xfer += oprot->writeString((*_iter5)); + } + xfer += oprot->writeListEnd(); + } + xfer += oprot->writeFieldEnd(); + + xfer += oprot->writeFieldStop(); + xfer += oprot->writeStructEnd(); + return xfer; +} + +void swap(command &a, command &b) +{ + using ::std::swap; + swap(a.cmd, b.cmd); + swap(a.arguments, b.arguments); + swap(a.__isset, b.__isset); +} + +command::command(const command &other6) +{ + cmd = other6.cmd; + arguments = other6.arguments; + __isset = other6.__isset; +} +command::command(command &&other7) +{ + cmd = std::move(other7.cmd); + arguments = std::move(other7.arguments); + __isset = std::move(other7.__isset); +} +command &command::operator=(const command &other8) +{ + cmd = other8.cmd; + arguments = other8.arguments; + __isset = other8.__isset; + return *this; +} +command &command::operator=(command &&other9) +{ + cmd = std::move(other9.cmd); + arguments = std::move(other9.arguments); + __isset = std::move(other9.__isset); + return *this; +} +void command::printTo(std::ostream &out) const +{ + using ::apache::thrift::to_string; + out << "command("; + out << "cmd=" << to_string(cmd); + out << ", " + << "arguments=" << to_string(arguments); + out << ")"; +} + +} // namespace diff --git a/src/tools/cli/CMakeLists.txt b/src/dist/cli/shell/CMakeLists.txt similarity index 86% rename from src/tools/cli/CMakeLists.txt rename to src/dist/cli/shell/CMakeLists.txt index ce30bdee73..cd73320b3a 100644 --- a/src/tools/cli/CMakeLists.txt +++ b/src/dist/cli/shell/CMakeLists.txt @@ -1,4 +1,4 @@ -set(MY_PROJ_NAME dsn.cli.tool) +set(MY_PROJ_NAME dsn_cli_shell) # Source files under CURRENT project directory will be automatically included. # You can manually set MY_PROJ_SRC to include source files under other directories. @@ -12,9 +12,9 @@ set(MY_SRC_SEARCH_MODE "GLOB") set(MY_PROJ_INC_PATH "") if (UNIX) - set(MY_PROJ_LIBS pthread dsn.cli) + set(MY_PROJ_LIBS pthread dsn_cli) else() - set(MY_PROJ_LIBS dsn.cli) + set(MY_PROJ_LIBS dsn_cli) endif() set(MY_PROJ_LIB_PATH "") diff --git a/src/tools/cli/cli.main.cpp b/src/dist/cli/shell/cli.main.cpp similarity index 100% rename from src/tools/cli/cli.main.cpp rename to src/dist/cli/shell/cli.main.cpp diff --git a/src/tools/cli/cli_app.cpp b/src/dist/cli/shell/cli_app.cpp similarity index 100% rename from src/tools/cli/cli_app.cpp rename to src/dist/cli/shell/cli_app.cpp diff --git a/src/tools/cli/cli_app.h b/src/dist/cli/shell/cli_app.h similarity index 97% rename from src/tools/cli/cli_app.h rename to src/dist/cli/shell/cli_app.h index 5ad60e8848..460fcf3aff 100644 --- a/src/tools/cli/cli_app.h +++ b/src/dist/cli/shell/cli_app.h @@ -36,7 +36,7 @@ #pragma once #include -#include +#include namespace dsn { namespace service { diff --git a/src/tools/cli/config.ini b/src/dist/cli/shell/config.ini similarity index 98% rename from src/tools/cli/config.ini rename to src/dist/cli/shell/config.ini index 16542061a8..632fcb1fa2 100644 --- a/src/tools/cli/config.ini +++ b/src/dist/cli/shell/config.ini @@ -19,7 +19,6 @@ tool = nativerun ;toollets = tracer, profiler ;fault_injector pause_on_start = false -cli_local = false [tools.simulator] random_seed = 2756568580 diff --git a/src/dist/nfs/test/config.ini b/src/dist/nfs/test/config.ini index 947d501f0b..d77d45c647 100644 --- a/src/dist/nfs/test/config.ini +++ b/src/dist/nfs/test/config.ini @@ -14,8 +14,6 @@ count = 1 enable_default_app_mimic = true tool = nativerun pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger io_worker_count = 1 diff --git a/src/dist/replication/lib/CMakeLists.txt b/src/dist/replication/lib/CMakeLists.txt index d69ec65b1e..da1d5eb721 100644 --- a/src/dist/replication/lib/CMakeLists.txt +++ b/src/dist/replication/lib/CMakeLists.txt @@ -16,6 +16,7 @@ set(MY_PROJ_LIBS dsn.failure_detector dsn.failure_detector.multimaster dsn_nfs + dsn_cli ) set(MY_PROJ_LIB_PATH "") diff --git a/src/dist/replication/lib/replica_stub.cpp b/src/dist/replication/lib/replica_stub.cpp index 56fe334a04..cafc7f90c6 100644 --- a/src/dist/replication/lib/replica_stub.cpp +++ b/src/dist/replication/lib/replica_stub.cpp @@ -556,9 +556,13 @@ void replica_stub::initialize(const replication_options &opts, bool clear /* = f for (const auto &kv : _replicas) { _fs_manager.add_replica(kv.first, kv.second->dir()); } + _nfs = std::move(dsn::nfs_node::create()); _nfs->start(); + _cli_service = std::move(dsn::cli_service::create_service()); + _cli_service->open_service(); + if (_options.delay_for_fd_timeout_on_start) { uint64_t now_time_ms = dsn_now_ms(); uint64_t delay_time_ms = diff --git a/src/dist/replication/lib/replica_stub.h b/src/dist/replication/lib/replica_stub.h index d022c6b1a0..aad6c4c699 100644 --- a/src/dist/replication/lib/replica_stub.h +++ b/src/dist/replication/lib/replica_stub.h @@ -37,6 +37,7 @@ #include #include #include +#include #include "dist/replication/common/replication_common.h" #include "dist/replication/common/fs_manager.h" @@ -261,6 +262,9 @@ class replica_stub : public serverlet, public ref_counter // nfs_node std::unique_ptr _nfs; + // cli service + std::unique_ptr _cli_service; + // performance counters perf_counter_wrapper _counter_replicas_count; perf_counter_wrapper _counter_replicas_opening_count; diff --git a/src/dist/replication/meta_server/CMakeLists.txt b/src/dist/replication/meta_server/CMakeLists.txt index 9c992e27d0..4b25e6ffae 100644 --- a/src/dist/replication/meta_server/CMakeLists.txt +++ b/src/dist/replication/meta_server/CMakeLists.txt @@ -17,6 +17,7 @@ set(MY_PROJ_LIBS dsn.block_service.fds dsn.failure_detector dsn.replication.zookeeper_provider + dsn_cli zookeeper_mt galaxy-fds-sdk-cpp PocoNet diff --git a/src/dist/replication/meta_server/meta_service.cpp b/src/dist/replication/meta_server/meta_service.cpp index e9993ec408..5ce5554066 100644 --- a/src/dist/replication/meta_server/meta_service.cpp +++ b/src/dist/replication/meta_server/meta_service.cpp @@ -228,6 +228,11 @@ error_code meta_service::start() // can tell others who is the current leader register_rpc_handlers(); + // start cli service before acquiring leader lock, + // so that the command line call can be handled + _cli_service = std::move(dsn::cli_service::create_service()); + _cli_service->open_service(); + _failure_detector->acquire_leader_lock(); dassert(_failure_detector->get_leader(nullptr), "must be primary at this point"); ddebug("%s got the primary lock, start to recover server state from remote storage", diff --git a/src/dist/replication/meta_server/meta_service.h b/src/dist/replication/meta_server/meta_service.h index 92d742188c..72f0487a7d 100644 --- a/src/dist/replication/meta_server/meta_service.h +++ b/src/dist/replication/meta_server/meta_service.h @@ -39,6 +39,7 @@ #include #include +#include #include #include "dist/replication/common/replication_common.h" @@ -196,6 +197,9 @@ class meta_service : public serverlet // (in other words, current service node) block_service_manager _block_service_manager; + // handle the command line service + std::unique_ptr _cli_service; + // [ // this is protected by failure_detector::_lock std::set _alive_set; diff --git a/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt b/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt index 9ab2c6ef1e..116e105897 100644 --- a/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt +++ b/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt @@ -18,6 +18,7 @@ set(MY_PROJ_LIBS dsn.replication.zookeeper_provider dsn.block_service.local dsn.block_service.fds dsn.failure_detector + dsn_cli zookeeper_mt galaxy-fds-sdk-cpp PocoNet diff --git a/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini b/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini index 704205504c..bfcf7b83a9 100644 --- a/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini +++ b/src/dist/replication/test/meta_test/unit_test/config-ddl-test.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler toollets = fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/meta_test/unit_test/config-test.ini b/src/dist/replication/test/meta_test/unit_test/config-test.ini index 1ddd0f6db8..e9d6f5de9d 100644 --- a/src/dist/replication/test/meta_test/unit_test/config-test.ini +++ b/src/dist/replication/test/meta_test/unit_test/config-test.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler ;fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/replica_test/unit_test/config-test.ini b/src/dist/replication/test/replica_test/unit_test/config-test.ini index f4ab9b7d39..c1e48cb1c7 100644 --- a/src/dist/replication/test/replica_test/unit_test/config-test.ini +++ b/src/dist/replication/test/replica_test/unit_test/config-test.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler ;fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-000.ini b/src/dist/replication/test/simple_kv/case-000.ini index 9fb8ddeb32..731351ee8b 100644 --- a/src/dist/replication/test/simple_kv/case-000.ini +++ b/src/dist/replication/test/simple_kv/case-000.ini @@ -42,8 +42,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-001.ini b/src/dist/replication/test/simple_kv/case-001.ini index 1c738757cd..20a2c79fa0 100644 --- a/src/dist/replication/test/simple_kv/case-001.ini +++ b/src/dist/replication/test/simple_kv/case-001.ini @@ -42,8 +42,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-002.ini b/src/dist/replication/test/simple_kv/case-002.ini index 92c5d11112..9d3cf7e8e6 100644 --- a/src/dist/replication/test/simple_kv/case-002.ini +++ b/src/dist/replication/test/simple_kv/case-002.ini @@ -42,8 +42,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-003.ini b/src/dist/replication/test/simple_kv/case-003.ini index eec4701e7c..87b885b3a2 100644 --- a/src/dist/replication/test/simple_kv/case-003.ini +++ b/src/dist/replication/test/simple_kv/case-003.ini @@ -42,8 +42,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-004.ini b/src/dist/replication/test/simple_kv/case-004.ini index 1fa18ff7c0..f33889515d 100644 --- a/src/dist/replication/test/simple_kv/case-004.ini +++ b/src/dist/replication/test/simple_kv/case-004.ini @@ -42,8 +42,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-005.ini b/src/dist/replication/test/simple_kv/case-005.ini index e43753edb6..e81dcf7384 100644 --- a/src/dist/replication/test/simple_kv/case-005.ini +++ b/src/dist/replication/test/simple_kv/case-005.ini @@ -42,8 +42,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-006.ini b/src/dist/replication/test/simple_kv/case-006.ini index c4a4e761ea..e8bad0f946 100644 --- a/src/dist/replication/test/simple_kv/case-006.ini +++ b/src/dist/replication/test/simple_kv/case-006.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-100.ini b/src/dist/replication/test/simple_kv/case-100.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-100.ini +++ b/src/dist/replication/test/simple_kv/case-100.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-101.ini b/src/dist/replication/test/simple_kv/case-101.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-101.ini +++ b/src/dist/replication/test/simple_kv/case-101.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-102.ini b/src/dist/replication/test/simple_kv/case-102.ini index e904138315..d90453349a 100644 --- a/src/dist/replication/test/simple_kv/case-102.ini +++ b/src/dist/replication/test/simple_kv/case-102.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-103.ini b/src/dist/replication/test/simple_kv/case-103.ini index 9890430097..335c33f2e0 100644 --- a/src/dist/replication/test/simple_kv/case-103.ini +++ b/src/dist/replication/test/simple_kv/case-103.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-104.ini b/src/dist/replication/test/simple_kv/case-104.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-104.ini +++ b/src/dist/replication/test/simple_kv/case-104.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-105.ini b/src/dist/replication/test/simple_kv/case-105.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-105.ini +++ b/src/dist/replication/test/simple_kv/case-105.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-106.ini b/src/dist/replication/test/simple_kv/case-106.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-106.ini +++ b/src/dist/replication/test/simple_kv/case-106.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-107.ini b/src/dist/replication/test/simple_kv/case-107.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-107.ini +++ b/src/dist/replication/test/simple_kv/case-107.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-108.ini b/src/dist/replication/test/simple_kv/case-108.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-108.ini +++ b/src/dist/replication/test/simple_kv/case-108.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-109.ini b/src/dist/replication/test/simple_kv/case-109.ini index f47ba02bbd..d2ca322a40 100644 --- a/src/dist/replication/test/simple_kv/case-109.ini +++ b/src/dist/replication/test/simple_kv/case-109.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-200.ini b/src/dist/replication/test/simple_kv/case-200.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-200.ini +++ b/src/dist/replication/test/simple_kv/case-200.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-201.ini b/src/dist/replication/test/simple_kv/case-201.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-201.ini +++ b/src/dist/replication/test/simple_kv/case-201.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-202-0.ini b/src/dist/replication/test/simple_kv/case-202-0.ini index 99837c8d59..4a9f9b8de6 100644 --- a/src/dist/replication/test/simple_kv/case-202-0.ini +++ b/src/dist/replication/test/simple_kv/case-202-0.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-202-1.ini b/src/dist/replication/test/simple_kv/case-202-1.ini index 99837c8d59..4a9f9b8de6 100644 --- a/src/dist/replication/test/simple_kv/case-202-1.ini +++ b/src/dist/replication/test/simple_kv/case-202-1.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-203-0.ini b/src/dist/replication/test/simple_kv/case-203-0.ini index 19bc2af79d..32a845c50a 100644 --- a/src/dist/replication/test/simple_kv/case-203-0.ini +++ b/src/dist/replication/test/simple_kv/case-203-0.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-203-1.ini b/src/dist/replication/test/simple_kv/case-203-1.ini index 19bc2af79d..32a845c50a 100644 --- a/src/dist/replication/test/simple_kv/case-203-1.ini +++ b/src/dist/replication/test/simple_kv/case-203-1.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-204.ini b/src/dist/replication/test/simple_kv/case-204.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-204.ini +++ b/src/dist/replication/test/simple_kv/case-204.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-205.ini b/src/dist/replication/test/simple_kv/case-205.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-205.ini +++ b/src/dist/replication/test/simple_kv/case-205.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-206.ini b/src/dist/replication/test/simple_kv/case-206.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-206.ini +++ b/src/dist/replication/test/simple_kv/case-206.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-207.ini b/src/dist/replication/test/simple_kv/case-207.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-207.ini +++ b/src/dist/replication/test/simple_kv/case-207.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-208.ini b/src/dist/replication/test/simple_kv/case-208.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-208.ini +++ b/src/dist/replication/test/simple_kv/case-208.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-209.ini b/src/dist/replication/test/simple_kv/case-209.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-209.ini +++ b/src/dist/replication/test/simple_kv/case-209.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-210.ini b/src/dist/replication/test/simple_kv/case-210.ini index c5fc21c4ee..0b41e8c3b0 100644 --- a/src/dist/replication/test/simple_kv/case-210.ini +++ b/src/dist/replication/test/simple_kv/case-210.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-211.ini b/src/dist/replication/test/simple_kv/case-211.ini index c5fc21c4ee..0b41e8c3b0 100644 --- a/src/dist/replication/test/simple_kv/case-211.ini +++ b/src/dist/replication/test/simple_kv/case-211.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-212.ini b/src/dist/replication/test/simple_kv/case-212.ini index c5fc21c4ee..0b41e8c3b0 100644 --- a/src/dist/replication/test/simple_kv/case-212.ini +++ b/src/dist/replication/test/simple_kv/case-212.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-213.ini b/src/dist/replication/test/simple_kv/case-213.ini index a2366cfa24..ce7e99ebdc 100644 --- a/src/dist/replication/test/simple_kv/case-213.ini +++ b/src/dist/replication/test/simple_kv/case-213.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-214.ini b/src/dist/replication/test/simple_kv/case-214.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-214.ini +++ b/src/dist/replication/test/simple_kv/case-214.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-215.ini b/src/dist/replication/test/simple_kv/case-215.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-215.ini +++ b/src/dist/replication/test/simple_kv/case-215.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-216.ini b/src/dist/replication/test/simple_kv/case-216.ini index 3c89be0231..e0804e4b69 100644 --- a/src/dist/replication/test/simple_kv/case-216.ini +++ b/src/dist/replication/test/simple_kv/case-216.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-300-0.ini b/src/dist/replication/test/simple_kv/case-300-0.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-300-0.ini +++ b/src/dist/replication/test/simple_kv/case-300-0.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-300-1.ini b/src/dist/replication/test/simple_kv/case-300-1.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-300-1.ini +++ b/src/dist/replication/test/simple_kv/case-300-1.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-300-2.ini b/src/dist/replication/test/simple_kv/case-300-2.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-300-2.ini +++ b/src/dist/replication/test/simple_kv/case-300-2.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-301.ini b/src/dist/replication/test/simple_kv/case-301.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-301.ini +++ b/src/dist/replication/test/simple_kv/case-301.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-302.ini b/src/dist/replication/test/simple_kv/case-302.ini index 235da48fb7..ce4ba08720 100644 --- a/src/dist/replication/test/simple_kv/case-302.ini +++ b/src/dist/replication/test/simple_kv/case-302.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-303.ini b/src/dist/replication/test/simple_kv/case-303.ini index ceee8abb56..d87a757849 100644 --- a/src/dist/replication/test/simple_kv/case-303.ini +++ b/src/dist/replication/test/simple_kv/case-303.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-304.ini b/src/dist/replication/test/simple_kv/case-304.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-304.ini +++ b/src/dist/replication/test/simple_kv/case-304.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-305.ini b/src/dist/replication/test/simple_kv/case-305.ini index ceee8abb56..d87a757849 100644 --- a/src/dist/replication/test/simple_kv/case-305.ini +++ b/src/dist/replication/test/simple_kv/case-305.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-306.ini b/src/dist/replication/test/simple_kv/case-306.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-306.ini +++ b/src/dist/replication/test/simple_kv/case-306.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-307.ini b/src/dist/replication/test/simple_kv/case-307.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-307.ini +++ b/src/dist/replication/test/simple_kv/case-307.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-400.ini b/src/dist/replication/test/simple_kv/case-400.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-400.ini +++ b/src/dist/replication/test/simple_kv/case-400.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-401.ini b/src/dist/replication/test/simple_kv/case-401.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-401.ini +++ b/src/dist/replication/test/simple_kv/case-401.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-402.ini b/src/dist/replication/test/simple_kv/case-402.ini index a13d95653a..0073b8839a 100644 --- a/src/dist/replication/test/simple_kv/case-402.ini +++ b/src/dist/replication/test/simple_kv/case-402.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-600.ini b/src/dist/replication/test/simple_kv/case-600.ini index c4a4e761ea..e8bad0f946 100644 --- a/src/dist/replication/test/simple_kv/case-600.ini +++ b/src/dist/replication/test/simple_kv/case-600.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-601.ini b/src/dist/replication/test/simple_kv/case-601.ini index f5101d8d7d..a6d965b1aa 100644 --- a/src/dist/replication/test/simple_kv/case-601.ini +++ b/src/dist/replication/test/simple_kv/case-601.ini @@ -43,8 +43,6 @@ toollets = tracer,test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-602.ini b/src/dist/replication/test/simple_kv/case-602.ini index c4a4e761ea..e8bad0f946 100644 --- a/src/dist/replication/test/simple_kv/case-602.ini +++ b/src/dist/replication/test/simple_kv/case-602.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/dist/replication/test/simple_kv/case-603.ini b/src/dist/replication/test/simple_kv/case-603.ini index 4e94be69ab..bc22a6b63b 100644 --- a/src/dist/replication/test/simple_kv/case-603.ini +++ b/src/dist/replication/test/simple_kv/case-603.ini @@ -43,8 +43,6 @@ toollets = test_injector ;toollets = tracer, profiler, fault_injector ;toollets = profiler, fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/tests/dsn/config-test.ini b/src/tests/dsn/config-test.ini index c486598b4c..f8bd553e96 100644 --- a/src/tests/dsn/config-test.ini +++ b/src/tests/dsn/config-test.ini @@ -53,8 +53,6 @@ tool = nativerun ;toollets = tracer, profiler ;fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_INFORMATION logging_factory_name = dsn::tools::simple_logger diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index ff7a377603..7bcb3335e6 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -1,2 +1 @@ -add_subdirectory(cli) add_subdirectory(repli) diff --git a/src/tools/repli/config.ini b/src/tools/repli/config.ini index ef3fc8b809..2c4d0d6847 100644 --- a/src/tools/repli/config.ini +++ b/src/tools/repli/config.ini @@ -19,8 +19,6 @@ tool = nativerun ;toollets = tracer, profiler ;fault_injector pause_on_start = false -cli_local = false -cli_remote = false logging_start_level = LOG_LEVEL_DEBUG logging_factory_name = dsn::tools::simple_logger