merge 2.1.0

hycdong · Sep 29, 2020 · f8067b8 · f8067b8
2 parents c9237dc + 0bd8f36
commit f8067b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/include/dsn/utility/error_code.h b/include/dsn/utility/error_code.h
@@ -119,8 +119,8 @@ DEFINE_ERR_CODE(ERR_APP_DROPPED)
 DEFINE_ERR_CODE(ERR_MOCK_INTERNAL)
 DEFINE_ERR_CODE(ERR_ZOOKEEPER_OPERATION)
 DEFINE_ERR_CODE(ERR_CHILD_REGISTERED)
-
 DEFINE_ERR_CODE(ERR_INGESTION_FAILED)
+
 DEFINE_ERR_CODE(ERR_CHILD_NOT_READY)
 DEFINE_ERR_CODE(ERR_PARENT_PARTITION_MISUSED)
 DEFINE_ERR_CODE(ERR_CHILD_DROPPED)

diff --git a/src/nfs/nfs_client_impl.cpp b/src/nfs/nfs_client_impl.cpp
@@ -558,6 +558,7 @@ void nfs_client_impl::handle_completion(const user_request_ptr &req, error_code
 
 void nfs_client_impl::register_cli_commands()
 {
+
     static std::once_flag flag;
     std::call_once(flag, [&]() {
         dsn::command_manager::instance().register_command(

diff --git a/src/replica/replica_2pc.cpp b/src/replica/replica_2pc.cpp
@@ -30,6 +30,7 @@
 #include "replica_stub.h"
 #include "bulk_load/replica_bulk_loader.h"
 #include "split/replica_split_manager.h"
+
 #include <dsn/dist/replication/replication_app_base.h>
 #include <dsn/dist/fmt_logging.h>
 
@@ -317,7 +318,6 @@ void replica::send_prepare_message(::dsn::rpc_address addr,
     replica_configuration rconfig;
     _primary_states.get_replica_config(status, rconfig, learn_signature);
     rconfig.__set_pop_all(pop_all_committed_mutations);
-
     if (status == partition_status::PS_SECONDARY && _primary_states.sync_send_write_request) {
         rconfig.split_sync_to_child = true;
     }