Increase timeout to all loadtest (ydb-platform#6631)

GrigoriyPA · Jul 12, 2024 · e8fe6aa · e8fe6aa
1 parent 2757f82
commit e8fe6aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ydb/tests/olap/lib/ydb_cli.py b/ydb/tests/olap/lib/ydb_cli.py
@@ -75,10 +75,12 @@ def _try_extract_error_message(stderr: str) -> str:
                 '--executer', 'generic',
                 '--include', str(query_num),
                 '--iterations', str(iterations),
-                '--query-settings', "PRAGMA ydb.HashJoinMode='grace';" + get_external_param('query-prefix', ''),
                 '--plan', plan_path,
                 '--verbose'
             ]
+            query_preffix = get_external_param('query-prefix', '')
+            if query_preffix:
+                cmd += ['--query-settings', query_preffix]
             err = None
             try:
                 exec: yatest.common.process._Execution = yatest.common.process.execute(cmd, wait=False, check_exit_code=False)

diff --git a/ydb/tests/olap/load/conftest.py b/ydb/tests/olap/load/conftest.py
@@ -10,7 +10,7 @@
 class LoadSuiteBase:
     iterations: int = 5
     workload_type: WorkloadType = None
-    timeout: float = 300.
+    timeout: float = 1800.
     refference: str = ''
 
     @property