opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-26 20:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23863 from inknos/issue-23436

Browse Source 
Add help message when starting multiple machines
This commit is contained in:
openshift-merge-bot[bot]
2024-09-13 17:38:52 +00:00
committed by GitHub
parent 4d9ce3309a d124d90e18
commit fdb8b1c6d3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/machine/e2e/start_test.go
View File

@ -210,10 +210,10 @@ var _ = Describe("podman machine start", func() {
Expect(startSession1).To(Or(Exit(0), Exit(125)), "start command should succeed or fail with 125")
if startSession1.ExitCode() == 0 {
Expect(startSession2).To(Exit(125), "first start worked, second start must fail")
Expect(startSession2.errorToString()).To(ContainSubstring("machine %s: VM already running or starting", machine1))
Expect(startSession2.errorToString()).To(ContainSubstring("machine %s is already running: only one VM can be active at a time", machine1))
} else {
Expect(startSession2).To(Exit(0), "first start failed, second start succeed")
Expect(startSession1.errorToString()).To(ContainSubstring("machine %s: VM already running or starting", machine2))
Expect(startSession1.errorToString()).To(ContainSubstring("machine %s is already running: only one VM can be active at a time", machine2))
}
})
})

5
pkg/machine/shim/host.go
View File

@ -283,7 +283,10 @@ func checkExclusiveActiveVM(provider vmconfigs.VMProvider, mc *vmconfigs.Machine
return err
}
if state == machineDefine.Running || state == machineDefine.Starting {
return fmt.Errorf("unable to start %q: machine %s: %w", mc.Name, name, machineDefine.ErrVMAlreadyRunning)
if mc.Name == name {
return fmt.Errorf("unable to start %q: machine %s: %w", mc.Name, name, machineDefine.ErrVMAlreadyRunning)
}
return fmt.Errorf("unable to start %q: machine %s is already running: %w", mc.Name, name, machineDefine.ErrMultipleActiveVM)
}
}
return nil