Skip to content

Fix: external driver transport irregularities #4877

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

Draft
unsuman wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −10
Draft

Fix: external driver transport irregularities #4877

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions pkg/driver/external/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ func Serve(ctx context.Context, driver driver.Driver) {
logger := logrus.New()
logger.SetLevel(logrus.DebugLevel)

socketPath := filepath.Join(os.TempDir(), fmt.Sprintf("lima-driver-%s-%d.sock", driver.Info().Name, os.Getpid()))
driverInfo := driver.Info()
socketPath := filepath.Join(os.TempDir(), fmt.Sprintf("lima-driver-%s-%d.sock", driverInfo.Name, os.Getpid()))

defer func() {
if err := os.Remove(socketPath); err != nil && !os.IsNotExist(err) {
Expand Down Expand Up @@ -146,7 +147,7 @@ func Serve(ctx context.Context, driver driver.Driver) {
}()

go func() {
logger.Infof("Starting external driver server for %s", driver.Info().Name)
logger.Infof("Starting external driver server for %s", driverInfo.Name)
logger.Infof("Server starting on Unix socket: %s", socketPath)
if err := server.Serve(tListener); err != nil {
if errors.Is(err, grpc.ErrServerStopped) {
Expand Down
9 changes: 6 additions & 3 deletions pkg/driverutil/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func CreateConfiguredDriver(inst *limatype.Instance, sshLocalPort int) (*driver.
if !exists {
return nil, fmt.Errorf("unknown or unsupported VM type: %s", *limaDriver)
}
var driverInfo driver.Info

if extDriver != nil {
extDriver.Logger.Debugf("Using external driver %q", extDriver.Name)
Expand All @@ -35,14 +36,16 @@ func CreateConfiguredDriver(inst *limatype.Instance, sshLocalPort int) (*driver.
extDriver.InstanceName = inst.Name
}

if !extDriver.Client.Info().Features.StaticSSHPort {
driverInfo = extDriver.Client.Info()
if !driverInfo.Features.StaticSSHPort {
inst.SSHLocalPort = sshLocalPort
}
return extDriver.Client.Configure(inst), nil
}

logrus.Debugf("Using internal driver %q", intDriver.Info().Name)
if !intDriver.Info().Features.StaticSSHPort {
driverInfo = intDriver.Info()
logrus.Debugf("Using internal driver %q", driverInfo.Name)
if !driverInfo.Features.StaticSSHPort {
inst.SSHLocalPort = sshLocalPort
}
return intDriver.Configure(inst), nil
Expand Down
11 changes: 6 additions & 5 deletions pkg/hostagent/hostagent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,12 @@ func New(ctx context.Context, instName string, stdout io.Writer, signalCh chan o
}
sshLocalPort = inst.SSHLocalPort

vSockPort := limaDriver.Info().VsockPort
virtioPort := limaDriver.Info().VirtioPort
noCloudInit := limaDriver.Info().Features.NoCloudInit
rosettaEnabled := limaDriver.Info().Features.RosettaEnabled
rosettaBinFmt := limaDriver.Info().Features.RosettaBinFmt
driverInfo := limaDriver.Info()
vSockPort := driverInfo.VsockPort
virtioPort := driverInfo.VirtioPort
noCloudInit := driverInfo.Features.NoCloudInit
rosettaEnabled := driverInfo.Features.RosettaEnabled
rosettaBinFmt := driverInfo.Features.RosettaBinFmt

// Disable Rosetta in Plain mode
if *inst.Config.Plain {
Expand Down
Loading