Skip to content

lambda: always pass SandboxMeta.Limits (zeros) and let pools default #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: refactor/sandboxmeta-limits-core
Choose a base branch
from
Draft

lambda: always pass SandboxMeta.Limits (zeros) and let pools default #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions go/worker/lambda/lambdaInstance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,24 @@ func (linst *LambdaInstance) Task() {
// if we don't already have a Sandbox, create one, and
// HTTP proxy over the channel
if sb == nil {
sb = nil
// Always build a meta that includes Limits (zeros => pools fill defaults)
meta := &sandbox.SandboxMeta{
Limits: common.Limits{},
}
if linst.meta != nil && linst.meta.Sandbox != nil {
meta.Installs = linst.meta.Sandbox.Installs
meta.Imports = linst.meta.Sandbox.Imports
}

if f.lmgr.ZygoteProvider != nil && f.rtType == common.RT_PYTHON {
scratchDir := f.lmgr.scratchDirs.Make(f.name)

// we don't specify parent SB, because ImportCache.Create chooses it for us
sb, err = f.lmgr.ZygoteProvider.Create(f.lmgr.sbPool, true, linst.codeDir, scratchDir, linst.meta.Sandbox, f.rtType)
sb, err = f.lmgr.ZygoteProvider.Create(
f.lmgr.sbPool, true, linst.codeDir, scratchDir, meta, f.rtType,
)
if err != nil {
f.printf("failed to get Sandbox from import cache")
f.printf("failed to get Sandbox from import cache: %v", err)
sb = nil
}
}
Expand All @@ -116,7 +125,9 @@ func (linst *LambdaInstance) Task() {
if sb == nil {
t2 := common.T0("LambdaInstance-WaitSandbox-NoImportCache")
scratchDir := f.lmgr.scratchDirs.Make(f.name)
sb, err = f.lmgr.sbPool.Create(nil, true, linst.codeDir, scratchDir, linst.meta.Sandbox, f.rtType)
sb, err = f.lmgr.sbPool.Create(
nil, true, linst.codeDir, scratchDir, meta, f.rtType,
)
t2.T1()
}

Expand Down