Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 21 additions & 2 deletions packages/envd/internal/api/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,24 +128,38 @@ 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()

lockWaitStart := time.Now()
a.initLock.Lock()
lockWait := time.Since(lockWaitStart)
defer a.initLock.Unlock()

// 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()) {
setDataStart := time.Now()
err = a.SetData(ctx, logger, initRequest)
setDataDur := time.Since(setDataStart)
if err != nil {
logger.Error().
Err(err).
Dur("init_lock_wait", lockWait).
Dur("set_data", setDataDur).
Msg("/init failed")
switch {
case errors.Is(err, ErrAccessTokenMismatch), errors.Is(err, ErrAccessTokenResetNotAuthorized):
w.WriteHeader(http.StatusUnauthorized)
default:
logger.Error().Msgf("Failed to set data: %v", err)
w.WriteHeader(http.StatusBadRequest)
}
w.Write([]byte(err.Error()))

return
}
logger.Info().
Dur("init_lock_wait", lockWait).
Dur("set_data", setDataDur).
Msg("/init handled")
} else {
logger.Debug().Dur("init_lock_wait", lockWait).Msg("/init skipped (older timestamp)")
}
}

Expand Down Expand Up @@ -214,16 +228,21 @@ func (a *API) SetData(ctx context.Context, logger zerolog.Logger, data PostInitJ
}

if data.CaBundle != nil && *data.CaBundle != "" {
caStart := time.Now()
err := a.caCertInstaller.Install(context.WithoutCancel(ctx), *data.CaBundle)
if err != nil {
return fmt.Errorf("failed to install CA bundle: %w", err)
}
Comment thread
ValentaTomas marked this conversation as resolved.
logger.Debug().Dur("ca_install", time.Since(caStart)).Msg("CA bundle install done")
}

if data.VolumeMounts != nil {
if err := a.setupNFS(ctx, logger, data.LifecycleID, *data.VolumeMounts); err != nil {
nfsStart := time.Now()
err := a.setupNFS(ctx, logger, data.LifecycleID, *data.VolumeMounts)
if err != nil {
return fmt.Errorf("failed to setup NFS volumes: %w", err)
}
Comment thread
ValentaTomas marked this conversation as resolved.
logger.Debug().Dur("nfs_setup", time.Since(nfsStart)).Msg("setupNFS done")
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion packages/envd/pkg/version.go
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