Merge pull request #138 from IBM/bug-137

Bug 137
IBM · Mar 16, 2022 · dfe74d8 · dfe74d8
2 parents 8a60123 + 1654c51
commit dfe74d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/libCli/Call.cpp b/src/libCli/Call.cpp
@@ -150,7 +150,7 @@ namespace cli
 
         // Get deadline for RPC from input or use custom
         std::optional<std::chrono::time_point<std::chrono::system_clock>> deadline;
-        std::chrono::time_point<std::chrono::system_clock> defaultDeadline = std::chrono::system_clock::now() + std::chrono::milliseconds(10000);
+        std::chrono::time_point<std::chrono::system_clock> defaultDeadline = std::chrono::system_clock::now() + std::chrono::milliseconds(30000);
 
 
         bool setTimeout = (parseTree.findFirstChild("rpcTimeout") != "");
@@ -281,7 +281,7 @@ namespace cli
             std::cerr << "RPC failed ;( Status code: " << std::to_string(status.error_code()) << " " << cli::getGrpcStatusCodeAsString(status.error_code()) << ", error message: " << status.error_message() << std::endl;
             if(status.error_code() == grpc::StatusCode::DEADLINE_EXCEEDED)
             {
-                std::cerr << "Note: You can increase the deadline by setting the --rpcTimeoutInMs option to a number or 'None'." << std::endl;
+                std::cerr << "Note: You can increase the deadline by setting the --rpcTimeoutMilliseconds option to a number or 'None'." << std::endl;
             }
             return -1;
         }

diff --git a/tests/functionTests/rpcTimeoutFunctionTest.txt b/tests/functionTests/rpcTimeoutFunctionTest.txt
@@ -73,7 +73,7 @@ RPC succeeded :D
 #END_TEST
 
 #START_TEST default timeout for unary RPCs exeeded
-@@CMD@@ localhost:50051 examples.StatusHandling rpcSleepForSeconds number=11
+@@CMD@@ localhost:50051 examples.StatusHandling rpcSleepForSeconds number=31
 /.* Deadline Exceeded
 /Note:.*
 #END_TEST

diff --git a/third_party/gRPC_utils/cli_call.cc b/third_party/gRPC_utils/cli_call.cc
@@ -76,7 +76,7 @@ CliCall::CliCall(const std::shared_ptr<grpc::Channel>& channel,
   // MODIFIED by IBM (Anna Riesch)
   // original: no deadline
   if (deadline.has_value()) {
-    // Set timelout if optional parameter has a value. Otherwise don't set timeout = infinite deadline
+    // Set timeout if optional parameter has a value. Otherwise don't set timeout = infinite deadline
     auto deadlineMs = deadline.value();
     ctx_.set_deadline(deadlineMs);
   }