Add 300sec client timeout to benchmark command (#3592)

Signed-off-by: Rishabh Singh <sngri@amazon.com>
opensearch-project · Jun 1, 2023 · 822fd36 · 822fd36
1 parent edf846d
commit 822fd36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/test_workflow/benchmark_test/benchmark_test_suite.py b/src/test_workflow/benchmark_test/benchmark_test_suite.py
@@ -53,6 +53,8 @@ def __init__(
 
     def execute(self) -> None:
         if self.security:
-            self.command += ' --client-options="use_ssl:true,verify_certs:false,basic_auth_user:\'admin\',basic_auth_password:\'admin\'"'
+            self.command += ' --client-options="timeout:300,use_ssl:true,verify_certs:false,basic_auth_user:\'admin\',basic_auth_password:\'admin\'"'
+        else:
+            self.command += ' --client-options="timeout:300"'
         logging.info(f"Executing {self.command}")
         subprocess.check_call(f"{self.command}", cwd=os.getcwd(), shell=True)
diff --git a/...s/tests_test_workflow/test_benchmark_workflow/benchmark_test/test_benchmark_test_suite.py b/...s/tests_test_workflow/test_benchmark_workflow/benchmark_test/test_benchmark_test_suite.py
@@ -30,7 +30,7 @@ def test_execute_default(self) -> None:
             self.assertEqual(mock_check_call.call_count, 1)
             self.assertEqual(self.benchmark_test_suite.command,
                              'docker run --rm opensearchproject/opensearch-benchmark:latest execute-test --workload=nyc_taxis '
-                             '--pipeline=benchmark-only --target-hosts=abc.com')
+                             '--pipeline=benchmark-only --target-hosts=abc.com --client-options="timeout:300"')
 
     def test_execute_security_enabled(self) -> None:
         benchmark_test_suite = BenchmarkTestSuite(endpoint=self.endpoint, security=True, args=self.args)
@@ -40,7 +40,7 @@ def test_execute_security_enabled(self) -> None:
             self.assertEqual(benchmark_test_suite.command,
                              'docker run --rm opensearchproject/opensearch-benchmark:latest execute-test '
                              '--workload=nyc_taxis --pipeline=benchmark-only '
-                             '--target-hosts=abc.com --client-options="use_ssl:true,'
+                             '--target-hosts=abc.com --client-options="timeout:300,use_ssl:true,'
                              'verify_certs:false,basic_auth_user:\'admin\',basic_auth_password:\'admin\'"')
 
     def test_execute_default_with_optional_args(self) -> None:
@@ -54,4 +54,4 @@ def test_execute_default_with_optional_args(self) -> None:
                                                                 '--workload=nyc_taxis '
                                                                 '--pipeline=benchmark-only --target-hosts=abc.com '
                                                                 '--workload-params "number_of_replicas:1" '
-                                                                '--user-tag="key1:value1,key2:value2" --telemetry node-stats')
+                                                                '--user-tag="key1:value1,key2:value2" --telemetry node-stats --client-options="timeout:300"')