fix format

GehaFearless · Nov 28, 2023 · dd36427 · dd36427
1 parent a1fd9e0
commit dd36427
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/src/client/replication_ddl_client.cpp b/src/client/replication_ddl_client.cpp
@@ -527,7 +527,7 @@ dsn::error_code replication_ddl_client::list_nodes(
 
     for (dsn::replication::node_info &n : resp.infos) {
         host_port hp;
-	HOST_PORT(n, address, hp);
+        HOST_PORT(n, address, hp);
         nodes[hp] = n.status;
     }
 

diff --git a/src/failure_detector/test/failure_detector.cpp b/src/failure_detector/test/failure_detector.cpp
@@ -214,7 +214,7 @@ class test_worker : public service_app, public serverlet<test_worker>
                   request.is_register ? "reg" : "unreg");
 
         host_port master;
-	HOST_PORT(request, master, master);
+        HOST_PORT(request, master, master);
 
         if (request.is_register)
             _worker_fd->register_master(master);

diff --git a/src/replica/duplication/replica_follower.cpp b/src/replica/duplication/replica_follower.cpp
@@ -120,18 +120,21 @@ void replica_follower::async_duplicate_checkpoint_from_master_replica()
     dsn::message_ex *msg = dsn::message_ex::create_request(
         RPC_CM_QUERY_PARTITION_CONFIG_BY_INDEX, 0, get_gpid().thread_hash());
     dsn::marshall(msg, meta_config_request);
-    rpc::call(_replica->get_dns_resolver()->resolve_address(meta_servers), msg, &_tracker, [&](error_code err, query_cfg_response &&resp) mutable {
-        FAIL_POINT_INJECT_F("duplicate_checkpoint_ok", [&](absl::string_view s) -> void {
-            _tracker.set_tasks_success();
-            return;
-        });
-
-        FAIL_POINT_INJECT_F("duplicate_checkpoint_failed",
-                            [&](absl::string_view s) -> void { return; });
-        if (update_master_replica_config(err, std::move(resp)) == ERR_OK) {
-            copy_master_replica_checkpoint();
-        }
-    });
+    rpc::call(_replica->get_dns_resolver()->resolve_address(meta_servers),
+              msg,
+              &_tracker,
+              [&](error_code err, query_cfg_response &&resp) mutable {
+                  FAIL_POINT_INJECT_F("duplicate_checkpoint_ok", [&](absl::string_view s) -> void {
+                      _tracker.set_tasks_success();
+                      return;
+                  });
+
+                  FAIL_POINT_INJECT_F("duplicate_checkpoint_failed",
+                                      [&](absl::string_view s) -> void { return; });
+                  if (update_master_replica_config(err, std::move(resp)) == ERR_OK) {
+                      copy_master_replica_checkpoint();
+                  }
+              });
 }
 
 // ThreadPool: THREAD_POOL_DEFAULT

diff --git a/src/runtime/rpc/rpc_host_port.h b/src/runtime/rpc/rpc_host_port.h
@@ -41,13 +41,13 @@ class TProtocol;
 } // namespace thrift
 } // namespace apache
 
-#define HOST_PORT(obj, field, target)                 \
-    do {                                              \
-        if (obj.__isset.hp_##field) {                 \
-            target = obj.hp_##field;                  \
-        } else {                                      \
-            target = std::move(dsn::host_port(obj.field)); \
-        }                                             \
+#define HOST_PORT(obj, field, target)                                                              \
+    do {                                                                                           \
+        if (obj.__isset.hp_##field) {                                                              \
+            target = obj.hp_##field;                                                               \
+        } else {                                                                                   \
+            target = std::move(dsn::host_port(obj.field));                                         \
+        }                                                                                          \
     } while (0)
 
 namespace dsn {

diff --git a/src/shell/commands/recovery.cpp b/src/shell/commands/recovery.cpp
@@ -295,7 +295,7 @@ bool ddd_diagnose(command_executor *e, shell_context *sc, arguments args)
         int j = 0;
         for (const ddd_node_info &n : pinfo.dropped) {
             dsn::host_port hp;
-	    HOST_PORT(n, node, hp);
+            HOST_PORT(n, node, hp);
             char time_buf[30] = {0};
             ::dsn::utils::time_ms_to_string(n.drop_time_ms, time_buf);
             out << "    dropped[" << j++ << "]: "