fix ci write file fail bug

junxfl · Nov 3, 2020 · 8b04e0e · 8b04e0e
1 parent 02e39b0
commit 8b04e0e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/test/integration/cluster_common/cluster_basic_test.cpp b/test/integration/cluster_common/cluster_basic_test.cpp
@@ -173,7 +173,7 @@ TEST_F(ClusterBasicTest, test_start_stop_module2) {
     ASSERT_GT(pid, 0);
     // 初始化mdsclient
     MetaServerOption_t op;
-    op.mdsRPCTimeoutMs = 500;
+    op.mdsRPCTimeoutMs = 4000;
     op.metaaddrvec = std::vector<std::string>{ "127.0.0.1:3333" };
     ASSERT_EQ(0, curveCluster_->InitMdsClient(op));
 

diff --git a/test/integration/raft/raft_snapshot_test.cpp b/test/integration/raft/raft_snapshot_test.cpp
@@ -165,7 +165,7 @@ class RaftSnapshotTest : public testing::Test {
 
         // 配置默认raft client option
         defaultCliOpt_.max_retry = 3;
-        defaultCliOpt_.timeout_ms = 3000;
+        defaultCliOpt_.timeout_ms = 10000;
     }
 
     virtual void TearDown() {
@@ -294,7 +294,7 @@ TEST_F(RaftSnapshotTest, AddPeerRecoverFromSnapshot) {
     ASSERT_EQ(0, cluster.StartPeer(peer4_,
                                    PeerCluster::PeerToId(peer4_)));
     status = AddPeer(logicPoolId, copysetId, conf, peer4_, defaultCliOpt_);
-    ASSERT_TRUE(status.ok());
+    ASSERT_TRUE(status.ok()) << status;
     // transfer leader 到peer4_，并读出来验证
     TransferLeaderAssertSuccess(&cluster, peer4_, defaultCliOpt_);
     leaderPeer = peer4_;

diff --git a/test/integration/snapshotcloneserver/snapshotcloneserver_common_test.cpp b/test/integration/snapshotcloneserver/snapshotcloneserver_common_test.cpp
@@ -193,6 +193,8 @@ const std::vector<std::string> snapshotcloneConf{
 
 const std::vector<std::string> clientConfigOptions{
     std::string("mds.listen.addr=") + kMdsIpPort,
+    std::string("global.logPath=") + kLogPath,
+    std::string("mds.rpcTimeoutMS=4000"),
 };
 
 const char* testFile1_ = "/ItUser1/file1";

diff --git a/test/integration/snapshotcloneserver/snapshotcloneserver_concurrent_test.cpp b/test/integration/snapshotcloneserver/snapshotcloneserver_concurrent_test.cpp
@@ -194,6 +194,8 @@ const std::vector<std::string> snapshotcloneConf{
 
 const std::vector<std::string> clientConfigOptions{
     std::string("mds.listen.addr=") + kMdsIpPort,
+    std::string("global.logPath=") + kLogPath,
+    std::string("mds.rpcTimeoutMS=4000"),
 };
 
 const char* testFile1_ = "/concurrentItUser1/file1";

diff --git a/test/integration/snapshotcloneserver/snapshotcloneserver_recover_test.cpp b/test/integration/snapshotcloneserver/snapshotcloneserver_recover_test.cpp
@@ -220,6 +220,8 @@ const std::vector<std::string> snapshotcloneConf{
 
 const std::vector<std::string> clientConfigOptions{
     std::string("mds.listen.addr=") + kMdsIpPort,
+    std::string("global.logPath=") + kLogPath,
+    std::string("mds.rpcTimeoutMS=4000"),
 };
 
 const char *testFile1_ = "/RcvItUser1/file1";