Skip to content

Fix vMCP server graceful shutdown #2472

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
merged 1 commit into from
Nov 6, 2025
Merged

Fix vMCP server graceful shutdown #2472

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
13 changes: 3 additions & 10 deletions pkg/vmcp/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func (s *Server) Stop(ctx context.Context) error {

var errs []error

// Stop HTTP server
// Stop HTTP server (this internally closes the listener)
if s.httpServer != nil {
// Create shutdown context with timeout
shutdownCtx, cancel := context.WithTimeout(ctx, defaultShutdownTimeout)
Expand All @@ -320,19 +320,12 @@ func (s *Server) Stop(ctx context.Context) error {
}
}

// Close listener
// Clear listener reference (already closed by httpServer.Shutdown)
s.listenerMu.Lock()
listener := s.listener
s.listener = nil
s.listenerMu.Unlock()

if listener != nil {
if err := listener.Close(); err != nil {
errs = append(errs, fmt.Errorf("failed to close listener: %w", err))
}
}

// Stop session manager
// Stop session manager after HTTP server shutdown
if s.sessionManager != nil {
if err := s.sessionManager.Stop(); err != nil {
errs = append(errs, fmt.Errorf("failed to stop session manager: %w", err))
Expand Down
Loading