JOJ/JOJ3
26
7
Fork 1
Code Issues 6 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(sandbox): add tar-based copyIn to bypass SOCK_SEQPACKET file limit
Some checks failed
submodules sync / sync (push) Successful in 35s
Details
build / build (push) Failing after 1m18s
Details
build / trigger-build-image (push) Has been skipped
Details

Browse Source
This commit is contained in:
张泊明518370910136 2026-07-22 23:56:41 -07:00
parent e285f33ecb
commit 98889ffbba
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/executor/sandbox/executor.go
View File

@ -52,15 +52,16 @@ func prepareTar(cmds []stage.Cmd) (bool, []byte) {
if cmds[i].CopyInDir != "" && if cmds[i].CopyInDir != "" &&
estimateCopyInSize(&cmds[i]) >= tarThreshold { estimateCopyInSize(&cmds[i]) >= tarThreshold {
tarData, keysInTar := createCopyInTar(&cmds[i]) tarData, keysInTar := createCopyInTar(&cmds[i])
if tarData == nil {
return false, nil
}
slog.Debug("prepareTar", "tarSize", len(tarData), "keysInTar", len(keysInTar))
for j := range cmds { for j := range cmds {
cmds[j].CopyInDir = "" cmds[j].CopyInDir = ""
for _, k := range keysInTar { for _, k := range keysInTar {
delete(cmds[j].CopyIn, k) delete(cmds[j].CopyIn, k)
} }
} }
if tarData == nil {
return false, nil
}
return true, tarData return true, tarData
} }
} }
@ -101,11 +102,11 @@ func (e *Sandbox) runWithTar(cmds []stage.Cmd, tarData []byte) ([]stage.Executor
tarFileName := "/w/__joj3_copyin.tar" tarFileName := "/w/__joj3_copyin.tar"
tarCmd := stage.Cmd{ tarCmd := stage.Cmd{
Args: []string{"/bin/tar", "xf", tarFileName, "-C", "/w"}, Args: []string{"/bin/tar", "xf", tarFileName, "-C", "/w", "--no-same-owner"},
Env: cmds[0].Env, Env: cmds[0].Env,
Stdin: &stage.CmdFile{Content: strPtr("")}, Stdin: &stage.CmdFile{Content: strPtr("")},
Stdout: &stage.CmdFile{Name: strPtr("__tar_stdout"), Max: int64Ptr(1)}, Stdout: &stage.CmdFile{Name: strPtr("__tar_stdout"), Max: int64Ptr(256)},
Stderr: &stage.CmdFile{Name: strPtr("__tar_stderr"), Max: int64Ptr(1)}, Stderr: &stage.CmdFile{Name: strPtr("__tar_stderr"), Max: int64Ptr(256)},
CPULimit: cmds[0].CPULimit, CPULimit: cmds[0].CPULimit,
ClockLimit: cmds[0].ClockLimit, ClockLimit: cmds[0].ClockLimit,
MemoryLimit: cmds[0].MemoryLimit, MemoryLimit: cmds[0].MemoryLimit,
@ -116,7 +117,6 @@ func (e *Sandbox) runWithTar(cmds []stage.Cmd, tarData []byte) ([]stage.Executor
CopyIn: map[string]stage.CmdFile{ CopyIn: map[string]stage.CmdFile{
tarFileName: {FileID: &fid}, tarFileName: {FileID: &fid},
}, },
CopyOutCached: []string{tarFileName},
} }
allCmds := append([]stage.Cmd{tarCmd}, cmds...) allCmds := append([]stage.Cmd{tarCmd}, cmds...)