meta: return forward address in configuration_query_by_index_response (…

…XiaoMi#212) (#1)
mentoswang · Dec 29, 2018 · 38f0d33 · 38f0d33
1 parent 38d7c02
commit 38f0d33
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 7 deletions.
diff --git a/include/dsn/cpp/serialization_helper/dsn.layer2_types.h b/include/dsn/cpp/serialization_helper/dsn.layer2_types.h
diff --git a/src/core/core/dsn.layer2_types.cpp b/src/core/core/dsn.layer2_types.cpp
diff --git a/src/dist/replication/meta_server/meta_service.cpp b/src/dist/replication/meta_server/meta_service.cpp
@@ -321,18 +321,23 @@ void meta_service::register_rpc_handlers()
         RPC_CM_DDD_DIAGNOSE, "ddd_diagnose", &meta_service::ddd_diagnose);
 }
 
-int meta_service::check_leader(dsn::message_ex *req)
+int meta_service::check_leader(dsn::message_ex *req, dsn::rpc_address *forward_address)
 {
     dsn::rpc_address leader;
     if (!_failure_detector->get_leader(&leader)) {
-        if (!req->header->context.u.is_forward_supported)
+        if (!req->header->context.u.is_forward_supported) {
+            if (forward_address != nullptr)
+                *forward_address = leader;
             return -1;
+        }
 
         dinfo("leader address: %s", leader.to_string());
         if (!leader.is_invalid()) {
             dsn_rpc_forward(req, leader);
             return 0;
         } else {
+            if (forward_address != nullptr)
+                forward_address->set_invalid();
             return -1;
         }
     }
@@ -341,7 +346,24 @@ int meta_service::check_leader(dsn::message_ex *req)
 
 #define RPC_CHECK_STATUS(dsn_msg, response_struct)                                                 \
     dinfo("rpc %s called", __FUNCTION__);                                                          \
-    int result = check_leader(dsn_msg);                                                            \
+    int result = check_leader(dsn_msg, nullptr);                                                   \
+    if (result == 0)                                                                               \
+        return;                                                                                    \
+    if (result == -1 || !_started) {                                                               \
+        if (result == -1)                                                                          \
+            response_struct.err = ERR_FORWARD_TO_OTHERS;                                           \
+        else if (_recovering)                                                                      \
+            response_struct.err = ERR_UNDER_RECOVERY;                                              \
+        else                                                                                       \
+            response_struct.err = ERR_SERVICE_NOT_ACTIVE;                                          \
+        ddebug("reject request with %s", response_struct.err.to_string());                         \
+        reply(dsn_msg, response_struct);                                                           \
+        return;                                                                                    \
+    }
+
+#define RPC_CHECK_STATUS_WITH_FORWARD(dsn_msg, response_struct)                                    \
+    dinfo("rpc %s called", __FUNCTION__);                                                          \
+    int result = check_leader(dsn_msg, &response_struct.forward_address);                          \
     if (result == 0)                                                                               \
         return;                                                                                    \
     if (result == -1 || !_started) {                                                               \
@@ -485,7 +507,7 @@ void meta_service::on_query_configuration_by_node(dsn::message_ex *msg)
 void meta_service::on_query_configuration_by_index(dsn::message_ex *msg)
 {
     configuration_query_by_index_response response;
-    RPC_CHECK_STATUS(msg, response);
+    RPC_CHECK_STATUS_WITH_FORWARD(msg, response);
 
     configuration_query_by_index_request request;
     dsn::unmarshall(msg, request);
@@ -588,7 +610,7 @@ void meta_service::on_start_recovery(dsn::message_ex *req)
 {
     configuration_recovery_response response;
     ddebug("got start recovery request, start to do recovery");
-    int result = check_leader(req);
+    int result = check_leader(req, nullptr);
     if (result == 0) // request has been forwarded to others
     {
         return;

diff --git a/src/dist/replication/meta_server/meta_service.h b/src/dist/replication/meta_server/meta_service.h
@@ -172,7 +172,8 @@ class meta_service : public serverlet<meta_service>
     //   1. the meta is leader
     //   0. meta isn't leader, and rpc-msg can forward to others
     //  -1. meta isn't leader, and rpc-msg can't forward to others
-    int check_leader(dsn::message_ex *req);
+    // if return -1 and `forward_address' != nullptr, then return leader by `forward_address'.
+    int check_leader(dsn::message_ex *req, dsn::rpc_address *forward_address);
     error_code remote_storage_initialize();
     bool check_freeze() const;
 

diff --git a/src/dsn.layer2.thrift b/src/dsn.layer2.thrift
@@ -29,6 +29,7 @@ struct configuration_query_by_index_response
     3:i32                           partition_count;
     4:bool                          is_stateful;
     5:list<partition_configuration> partitions;    
+    6:dsn.rpc_address               forward_address;
 }
 
 enum app_status