Merge branch 'fds_test_fix' of github.com:zhangyifan27/rdsn into fds_…

…test_fix
XiaoMi · Oct 10, 2020 · d4b3864 · d4b3864
2 parents a421036 + b78b848
commit d4b3864
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/include/dsn/dist/replication/replication_app_base.h b/include/dsn/dist/replication/replication_app_base.h
@@ -242,6 +242,13 @@ class replication_app_base : public replica_base
 
     virtual ingestion_status::type get_ingestion_status() { return ingestion_status::IS_INVALID; }
 
+    virtual void on_detect_hotkey(const detect_hotkey_request &req,
+                                  /*out*/ detect_hotkey_response &resp)
+    {
+        resp.err = dsn::ERR_OBJECT_NOT_FOUND;
+        resp.__set_err_hint("on_detect_hotkey implementation not found");
+    }
+
 public:
     //
     // utility functions to be used by app

diff --git a/src/replica/replica.cpp b/src/replica/replica.cpp
@@ -459,5 +459,11 @@ void replica::init_table_level_latency_counters()
         }
     }
 }
+
+void replica::on_detect_hotkey(const detect_hotkey_request &req, detect_hotkey_response &resp)
+{
+    _app->on_detect_hotkey(req, resp);
+}
+
 } // namespace replication
 } // namespace dsn
diff --git a/src/replica/replica.h b/src/replica/replica.h
@@ -383,6 +383,8 @@ class replica : public serverlet<replica>, public ref_counter, public replica_ba
 
     void init_table_level_latency_counters();
 
+    void on_detect_hotkey(const detect_hotkey_request &req, /*out*/ detect_hotkey_response &resp);
+
 private:
     friend class ::dsn::replication::test::test_checker;
     friend class ::dsn::replication::mutation_queue;

diff --git a/src/replica/replica_stub.cpp b/src/replica/replica_stub.cpp
@@ -2784,7 +2784,7 @@ void replica_stub::on_detect_hotkey(detect_hotkey_rpc rpc)
 
     replica_ptr rep = get_replica(request.pid);
     if (rep != nullptr) {
-        response.err = ERR_OK;
+        rep->on_detect_hotkey(request, response);
     } else {
         response.err = ERR_OBJECT_NOT_FOUND;
         response.err_hint = fmt::format("not find the replica {} \n", request.pid);