28 lines
1012 B
Diff
28 lines
1012 B
Diff
From c530f83fb28347c57bb5b1ed58a9b1770b7c2677 Mon Sep 17 00:00:00 2001
|
|
From: zhongtao <zhongtao17@huawei.com>
|
|
Date: Wed, 21 Jun 2023 01:20:27 +1400
|
|
Subject: [PATCH 12/15] disable the exec timeout function for kata runtime
|
|
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
|
---
|
|
src/cmd/isulad-shim/process.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/cmd/isulad-shim/process.c b/src/cmd/isulad-shim/process.c
|
|
index 11889cce..2e76574d 100644
|
|
--- a/src/cmd/isulad-shim/process.c
|
|
+++ b/src/cmd/isulad-shim/process.c
|
|
@@ -1214,7 +1214,8 @@ static int waitpid_with_timeout(int ctr_pid, int *status, const uint64_t timeou
|
|
*/
|
|
static int wait_container_process_with_timeout(process_t *p, const uint64_t timeout, int *status)
|
|
{
|
|
- if (timeout > 0) {
|
|
+ // currently, kata runtime does not support setting timeout during exec
|
|
+ if (strcasecmp(p->runtime, "kata-runtime") != 0 && timeout > 0) {
|
|
return waitpid_with_timeout(p->ctr_pid, status, timeout);
|
|
}
|
|
|
|
--
|
|
2.25.1
|
|
|