Skip to content

fix(mcp): propagate network errors from replaceContainerSnapshot #204

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

Closed
HoneyBBQ wants to merge 1 commit into from
Closed

fix(mcp): propagate network errors from replaceContainerSnapshot #204

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
15 changes: 8 additions & 7 deletions internal/mcp/versioning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"log/slog"
"math"
"strings"
"time"
Expand Down Expand Up @@ -392,16 +391,18 @@ func (m *Manager) replaceContainerSnapshot(ctx context.Context, botID, container
// unconditionally so the next call dials fresh to the new process.
m.grpcPool.Remove(botID)

if netResult, err := m.service.SetupNetwork(ctx, ctr.NetworkSetupRequest{
netResult, err := m.service.SetupNetwork(ctx, ctr.NetworkSetupRequest{
ContainerID: containerID,
CNIBinDir: m.cfg.CNIBinaryDir,
CNIConfDir: m.cfg.CNIConfigDir,
}); err != nil {
m.logger.Warn("network setup failed after snapshot replace",
slog.String("container_id", containerID), slog.Any("error", err))
} else {
m.SetContainerIP(botID, netResult.IP)
})
if err != nil {
return fmt.Errorf("network setup after snapshot replace: %w", err)
}
if netResult.IP == "" {
return fmt.Errorf("network setup returned no IP after snapshot replace for %s", containerID)
}
m.SetContainerIP(botID, netResult.IP)
return nil
}

Expand Down