fix retry policy and remove unused code

Change-Id: I62b93ae8fae7a4f7430a475673ee0aa6cd826956
quas-modo · Mar 31, 2020 · e53eefe · e53eefe
1 parent 7077387
commit e53eefe
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 23,075 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,3 +72,5 @@ bazel-testlogs
 
 #log
 *.log
+
+.clang-format
diff --git a/conf/client.conf b/conf/client.conf
@@ -137,8 +137,3 @@ global.logPath=/data/log/curve/
 ############### metric 配置信息 #############
 #
 global.metricDummyServerStartPort=9000
-
-#
-# session map文件，存储打开文件的filename到path的映射
-#
-global.sessionMapPath=./session_map.json
diff --git a/src/client/BUILD b/src/client/BUILD
@@ -32,7 +32,6 @@ cc_library(
         "//external:leveldb",
         "//external:brpc",
         "//external:braft",
-        "//thirdparties/mordenjson:jsonmorden",
         "//external:protobuf",
         "//src/common:curve_common",
         "//src/common:curve_auth",

diff --git a/src/client/chunk_closure.cpp b/src/client/chunk_closure.cpp
@@ -128,11 +128,14 @@ void ClientClosure::PreProcessBeforeRetry(int rpcstatus, int cntlstatus) {
         bthread_usleep(nextsleeptime);
         return;
     } else if (rpcstatus == CHUNK_OP_STATUS::CHUNK_OP_STATUS_REDIRECTED) {
-        LOG(WARNING) << "leader redirect, retry directly, " << *reqCtx
+        auto nextsleeptime = failReqOpt_.chunkserverOPRetryIntervalUS / 10;
+        LOG(WARNING) << "leader redirect, sleep(us) = " << nextsleeptime
+                     << ", " << *reqCtx
                      << ", retried times = " << reqDone->GetRetriedTimes()
                      << ", IO id = " << reqDone->GetIOTracker()->GetID()
                      << ", request id = " << reqCtx->id_
                      << ", remote side = " << remoteAddress_;
+        bthread_usleep(nextsleeptime);
         return;
     }
 

diff --git a/src/client/client_config.cpp b/src/client/client_config.cpp
@@ -195,10 +195,6 @@ int ClientConfig::Init(const char* configpath) {
     LOG_IF(ERROR, ret == false) << "config no mds.registerToMDS info";
     RETURN_IF_FALSE(ret)
 
-    ret = conf_.GetStringValue("global.sessionMapPath",
-        &fileServiceOption_.sessionmapOpt.sessionmap_path);
-    LOG_IF(ERROR, ret == false) << "config no global.sessionMapPath info";
-
     return 0;
 }
 

diff --git a/src/client/config_info.h b/src/client/config_info.h
@@ -273,15 +273,6 @@ typedef struct ClientConfigOption {
     MetaServerOption_t         metaServerOpt;
 } ClientConfigOption_t;
 
-/**
- * session id file option
- * session文件用于存储当前打开文件的session信息
- * @sessionmap_path: session文件的路径
- */
-typedef struct SessionIDMapOption {
-    std::string sessionmap_path;
-} SessionIDMapOption_t;
-
 /**
  * FileServiceOption是QEMU侧总体配置信息
  */
@@ -291,7 +282,6 @@ typedef struct FileServiceOption {
     LeaseOption_t             leaseOpt;
     CommonConfigOpt_t         commonOpt;
     MetaServerOption_t        metaServerOpt;
-    SessionIDMapOption_t      sessionmapOpt;
 } FileServiceOption_t;
 
 #endif  // SRC_CLIENT_CONFIG_INFO_H_
diff --git a/src/client/file_instance.cpp b/src/client/file_instance.cpp
@@ -18,7 +18,6 @@
 #include "src/client/iomanager4file.h"
 #include "src/client/request_scheduler.h"
 #include "src/client/request_sender_manager.h"
-#include "src/client/session_map.h"
 
 using curve::client::ClientConfig;
 using curve::common::TimeUtility;

diff --git a/src/client/session_map.cpp b/src/client/session_map.cpp
diff --git a/src/client/session_map.h b/src/client/session_map.h
diff --git a/src/client/timertask_worker.h b/src/client/timertask_worker.h
@@ -19,9 +19,9 @@
 #include "src/common/timeutility.h"
 
 using curve::common::TimeUtility;
-typedef std::chrono::microseconds   MicroSeconds;
-typedef std::chrono::steady_clock   SteadyClock;
-typedef std::chrono::steady_clock::time_point TimePoint;
+using MicroSeconds = std::chrono::microseconds;
+using SteadyClock = std::chrono::steady_clock;
+using TimePoint = SteadyClock::time_point;
 
 namespace curve {
 namespace client {

diff --git a/test/client/client_mdsclient_metacache_unittest.cpp b/test/client/client_mdsclient_metacache_unittest.cpp
@@ -1315,7 +1315,8 @@ TEST_F(MDSClientTest, GetLeaderTest) {
     ASSERT_EQ(0, mc.GetLeader(1234, 1234, &ckid, &leaderep, true));
 
     // 从1,2获取leader, 但是controller返回错误, 所以会去mds获取新的server list
-    ASSERT_EQ(1, cliservice1.GetInvokeTimes() + cliservice2.GetInvokeTimes());
+    // get server list后继续从1,2上获取leader, 结果还是失败。总共重试3次
+    ASSERT_EQ(3, cliservice1.GetInvokeTimes() + cliservice2.GetInvokeTimes());
     ASSERT_EQ(0, cliservice3.GetInvokeTimes());
 
     // 因为从mds获取新的copyset信息了，所以其leader信息被重置了，需要重新获取新leader

diff --git a/test/client/client_metric_test.cpp b/test/client/client_metric_test.cpp
@@ -326,6 +326,20 @@ TEST(MetricTest, MetricHelperTest) {
     ASSERT_NO_THROW(MetricHelper::IncremIOSuspendNum(&fm2));
     ASSERT_NO_THROW(MetricHelper::DecremIOSuspendNum(&fm2));
     ASSERT_NO_THROW(MetricHelper::LatencyRecord(&fm2, 0, OpType::READ));
+
+    ASSERT_NO_THROW(MetricHelper::IncremGetLeaderRetryTime(nullptr));
+    ASSERT_NO_THROW(MetricHelper::IncremUserQPSCount(nullptr, 0, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::IncremUserEPSCount(nullptr, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::IncremUserRPSCount(nullptr, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::IncremFailRPCCount(nullptr, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::IncremTimeOutRPCCount(nullptr, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::IncremRPCQPSCount(nullptr, 0, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::IncremRPCRPSCount(nullptr, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::LatencyRecord(nullptr, 0, OpType::READ));
+    ASSERT_NO_THROW(MetricHelper::IncremInflightRPC(nullptr));
+    ASSERT_NO_THROW(MetricHelper::DecremInflightRPC(nullptr));
+    ASSERT_NO_THROW(MetricHelper::IncremIOSuspendNum(nullptr));
+    ASSERT_NO_THROW(MetricHelper::DecremIOSuspendNum(nullptr));
 }
 
 }   //  namespace client
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,3 +72,5 @@ bazel-testlogs

		#log
		*.log

		.clang-format