Modify the influenced files

grpc · Oct 30, 2024 · 885e109 · 885e109
1 parent fedbd64
commit 885e109
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestCases.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestCases.java
@@ -57,7 +57,11 @@ public enum TestCases {
   VERY_LARGE_REQUEST("very large request"),
   PICK_FIRST_UNARY("all requests are sent to one server despite multiple servers are resolved"),
   RPC_SOAK("sends 'soak_iterations' large_unary rpcs in a loop, each on the same channel"),
+  RPC_SOAK_CONCURRENT("sends 'soak_iterations' large_unary rpcs in a loop, each on the same channel,"
+      + " and using multiple threads concurrently"),
   CHANNEL_SOAK("sends 'soak_iterations' large_unary rpcs in a loop, each on a new channel"),
+  CHANNEL_SOAK_CONCURRENT("sends 'soak_iterations' large_unary rpcs in a loop, each on a new channel,"
+      + " and using multiple threads concurrently"),
   ORCA_PER_RPC("report backend metrics per query"),
   ORCA_OOB("report backend metrics out-of-band");
 

diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java
@@ -520,6 +520,22 @@ private void runTest(TestCases testCase) throws Exception {
         tester.performSoakTest(
             serverHost,
             false /* resetChannelPerIteration */,
+            false /* concurrent */,
+            soakIterations,
+            soakMaxFailures,
+            soakPerIterationMaxAcceptableLatencyMs,
+            soakMinTimeMsBetweenRpcs,
+            soakOverallTimeoutSeconds,
+            soakRequestSize,
+            soakResponseSize);
+        break;
+      }
+
+      case RPC_SOAK_CONCURRENT: {
+        tester.performSoakTest(
+            serverHost,
+            false /* resetChannelPerIteration */,
+            true /* concurrent */,
             soakIterations,
             soakMaxFailures,
             soakPerIterationMaxAcceptableLatencyMs,
@@ -534,6 +550,7 @@ private void runTest(TestCases testCase) throws Exception {
         tester.performSoakTest(
             serverHost,
             true /* resetChannelPerIteration */,
+            false /* concurrent */,
             soakIterations,
             soakMaxFailures,
             soakPerIterationMaxAcceptableLatencyMs,
@@ -542,7 +559,21 @@ private void runTest(TestCases testCase) throws Exception {
             soakRequestSize,
             soakResponseSize);
         break;
+      }
 
+      case CHANNEL_SOAK_CONCURRENT: {
+        tester.performSoakTest(
+            serverHost,
+            true /* resetChannelPerIteration */,
+            true /* concurrent */,
+            soakIterations,
+            soakMaxFailures,
+            soakPerIterationMaxAcceptableLatencyMs,
+            soakMinTimeMsBetweenRpcs,
+            soakOverallTimeoutSeconds,
+            soakRequestSize,
+            soakResponseSize);
+        break;
       }
 
       case ORCA_PER_RPC: {