Skip to content

fix(envd): make /init lock ctx-aware to prevent retry pile-up #2702

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

Merged
jakubno merged 4 commits into from
May 18, 2026
Merged

fix(envd): make /init lock ctx-aware to prevent retry pile-up #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4da68d9
fix(envd): make /init lock ctx-aware to prevent retry pile-up
ValentaTomas May 17, 2026
c91a0d5
drop warn log on initLock ctx cancel
ValentaTomas May 18, 2026
a317ce7
use semaphore.Weighted for initLock
ValentaTomas May 18, 2026
b3c2214
drop redundant initLock comment
ValentaTomas May 18, 2026
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
8 changes: 6 additions & 2 deletions packages/envd/internal/api/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,12 @@ func (a *API) PostInit(w http.ResponseWriter, r *http.Request) {
// Safe because Destroy() is nil-safe and TakeFrom clears the source.
defer initRequest.AccessToken.Destroy()

a.initLock.Lock()
defer a.initLock.Unlock()
if err := a.initLock.Acquire(ctx, 1); err != nil {
w.WriteHeader(http.StatusServiceUnavailable)

return
}
defer a.initLock.Release(1)

// Update data only if the request is newer or if there's no timestamp at all
if initRequest.Timestamp == nil || a.lastSetTime.SetToGreater(initRequest.Timestamp.UnixNano()) {
Expand Down
4 changes: 3 additions & 1 deletion packages/envd/internal/api/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"sync/atomic"

"github.com/rs/zerolog"
"golang.org/x/sync/semaphore"

"github.com/e2b-dev/infra/packages/envd/internal/execcontext"
"github.com/e2b-dev/infra/packages/envd/internal/host"
Expand Down Expand Up @@ -37,7 +38,7 @@ type API struct {
mmdsClient MMDSClient

lastSetTime *utils.AtomicMax
initLock sync.Mutex
initLock *semaphore.Weighted

caCertInstaller *host.CACertInstaller
isMountingNFS atomic.Bool
Expand All @@ -54,6 +55,7 @@ func New(l *zerolog.Logger, defaults *execcontext.Defaults, mmdsChan chan *host.
lastSetTime: utils.NewAtomicMax(),
accessToken: &SecureToken{},
caCertInstaller: host.NewCACertInstaller(l),
initLock: semaphore.NewWeighted(1),
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/envd/pkg/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package pkg

const Version = "0.5.23"
const Version = "0.5.24"
Loading