kalugin66/windmill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nsjail skip_setsid for pg propagation + faster exit

Browse Source
This commit is contained in:
Ruben Fiszel
2025-07-13 11:48:01 +00:00
parent 4650098565
commit d8da07cbe9
14 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/windmill-worker/nsjail/download.py.config.proto
View File

@@ -18,6 +18,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: true
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/download.rust.config.proto
View File

@@ -10,6 +10,7 @@ cwd: "/tmp"
clone_newnet: false
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.ansible.config.proto
View File

@@ -14,6 +14,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.bash.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.bun.config.proto
View File

@@ -14,6 +14,7 @@ clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
clone_newcgroup: false
skip_setsid: true
keep_caps: false
keep_env: true

1
backend/windmill-worker/nsjail/run.csharp.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.go.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp/go"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true

1
backend/windmill-worker/nsjail/run.java.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.nu.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.php.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.powershell.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.python3.config.proto
View File

@@ -14,6 +14,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true
mount_proc: true

1
backend/windmill-worker/nsjail/run.rust.config.proto
View File

@@ -11,6 +11,7 @@ cwd: "/tmp"
clone_newnet: false
clone_newuser: {CLONE_NEWUSER}
skip_setsid: true
keep_caps: false
keep_env: true

24
backend/windmill-worker/src/worker.rs
View File

@@ -850,26 +850,26 @@ pub fn start_interactive_worker_shell(
}
Ok(None) => {
let now = Instant::now();
match last_executed_job {
let nap_time = match last_executed_job {
Some(last)
if now.duration_since(last).as_secs()
> TIMEOUT_TO_RESET_WORKER_SHELL_NAP_TIME_DURATION =>
{
tokio::time::sleep(Duration::from_secs(
Duration::from_secs(
WORKER_SHELL_NAP_TIME_DURATION,
))
.await;
)
}
_ => {
tokio::select! {
_ = tokio::time::sleep(Duration::from_millis(*SLEEP_QUEUE * 10)) => {
}
_ = killpill_rx.recv() => {
break;
}
}
Duration::from_millis(*SLEEP_QUEUE * 10)
}
}
};
tokio::select! {
_ = tokio::time::sleep(nap_time) => {
}
_ = killpill_rx.recv() => {
break;
}
}
}
Err(err) => {