Skip to content

fix(orchestrator): bug fix in pkg/nfsproxy/recovery #2606

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
tvi merged 1 commit into from
May 10, 2026
Merged

fix(orchestrator): bug fix in pkg/nfsproxy/recovery #2606

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
17 changes: 8 additions & 9 deletions packages/orchestrator/pkg/nfsproxy/recovery/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ func WrapWithRecovery(ctx context.Context, h nfs.Handler) *Handler {
}

func (h Handler) Mount(ctx context.Context, conn net.Conn, request nfs.MountRequest) (nfs.MountStatus, billy.Filesystem, []nfs.AuthFlavor) {
defer h.tryRecovery(ctx, "Mount")
defer tryRecovery(ctx, "Mount")
s, fs, auth := h.inner.Mount(ctx, conn, request)
fs = wrapFS(ctx, fs)

return s, fs, auth
}

func (h Handler) Change(ctx context.Context, filesystem billy.Filesystem) billy.Change {
defer h.tryRecovery(ctx, "Change")
defer tryRecovery(ctx, "Change")
c := h.inner.Change(ctx, filesystem)

return wrapChange(ctx, c)
Expand All @@ -46,7 +46,7 @@ func (h Handler) FSStat(ctx context.Context, filesystem billy.Filesystem, stat *
}

func (h Handler) ToHandle(ctx context.Context, fs billy.Filesystem, path []string) []byte {
defer h.tryRecovery(ctx, "ToHandle")
defer tryRecovery(ctx, "ToHandle")

return h.inner.ToHandle(ctx, fs, path)
}
Expand All @@ -64,17 +64,16 @@ func (h Handler) InvalidateHandle(ctx context.Context, filesystem billy.Filesyst
}

func (h Handler) HandleLimit() int {
defer h.tryRecovery(h.ctx, "HandleLimit")
defer tryRecovery(h.ctx, "HandleLimit")

return h.inner.HandleLimit()
}

func (h Handler) tryRecovery(ctx context.Context, name string) {
tryRecovery(ctx, name)
}

// tryRecovery must be called via `defer` directly so that recover() runs in
// the deferred function frame. Nesting it inside another helper would cause
// recover() to return nil and the panic would propagate.
func tryRecovery(ctx context.Context, name string) {
if r := recover(); r != nil { //nolint:revive // tryRecovery is always called via defer
if r := recover(); r != nil { //nolint:revive // always called via defer
logger.L().Error(ctx, fmt.Sprintf("panic in %q nfs handler", name),
zap.Any("panic", r),
zap.Stack("stack"),
Expand Down
Loading