Skip to content

Commit d0b0731

Browse files
authored
[k2] update monitoring options in testing system (#1569)
Signed-off-by: Petr Shumilov <p.shumilov@vkteam.ru>
1 parent cd128fe commit d0b0731

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

tests/kphp_ci_pipeline_runner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,8 +438,8 @@ def _calculate_pytest_jobs_count(default_percent: int = 95) -> int:
438438
cmd="KPHP_TESTS_POLYFILLS_REPO={kphp_polyfills_repo} "
439439
"KPHP_CXX={cxx_name} "
440440
"K2_BIN={k2_bin} "
441-
"K2_MONITORING_ABORT_HANGING_GLOBAL_TASK=false "
442-
"K2_MONITORING_ABORT_HANGING_REQUEST_TASK=false "
441+
"K2_MONITORING_REQUEST_TASK_HARD_TIMEOUT=30 "
442+
"K2_MONITORING_GLOBAL_TASK_HARD_TIMEOUT=30 "
443443
"KPHP_TRACKED_BUILTINS_LIST={K2_KPHP_TRACKED_BUILTINS_LIST} "
444444
"python3 -m pytest --basetemp={base_tempdir} --tb=native -n{jobs} {functional_tests_dir}".format(
445445
kphp_polyfills_repo=kphp_polyfills_repo,

tests/python/lib/kphp_run_once.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def run_with_kphp_and_k2(self, runs_cnt=1, args=[]):
156156

157157
k2_node_bin = self.k2_bin
158158

159-
cmd = [k2_node_bin, "run-once", "--image", os.path.join(self._kphp_build_tmp_dir, "component.so"), "--runs-count={}".format(runs_cnt), "--crypto", "--instance-cache"] + args
159+
cmd = [k2_node_bin, "run-once", "--image", os.path.join(self._kphp_build_tmp_dir, "component.so"), "--runs-count={}".format(runs_cnt), "--crypto", "--instance-cache", "--task-hard-timeout", "30"] + args
160160

161161
env = os.environ.copy()
162162
if "RUST_LOG" not in env:

0 commit comments

Comments
 (0)