Logs for Start

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2015-12-30 11:50:39 +01:00
parent bbe76b5a26
commit 783d2b124e
11 changed files with 12 additions and 35 deletions

View File

@ -614,11 +614,7 @@ func (d *Driver) Start() error {
return err return err
} }
if err := d.waitForInstance(); err != nil { return d.waitForInstance()
return err
}
return nil
} }
func (d *Driver) Stop() error { func (d *Driver) Stop() error {

View File

@ -288,8 +288,6 @@ func (d *Driver) Start() error {
return nil return nil
} }
log.Debugf("starting %s", d.MachineName)
if err := vmClient.StartRole(d.MachineName, d.MachineName, d.MachineName); err != nil { if err := vmClient.StartRole(d.MachineName, d.MachineName, d.MachineName); err != nil {
return err return err
} }

View File

@ -322,24 +322,14 @@ func (d *Driver) Create() error {
} }
func (d *Driver) Start() error { func (d *Driver) Start() error {
vmstate, err := d.GetState()
if err != nil {
return err
}
if vmstate == state.Running || vmstate == state.Starting {
log.Infof("Host is already running or starting")
return nil
}
client := egoscale.NewClient(d.URL, d.APIKey, d.APISecretKey) client := egoscale.NewClient(d.URL, d.APIKey, d.APISecretKey)
svmresp, err := client.StartVirtualMachine(d.ID) svmresp, err := client.StartVirtualMachine(d.ID)
if err != nil { if err != nil {
return err return err
} }
if err = d.waitForJob(client, svmresp); err != nil {
return err return d.waitForJob(client, svmresp)
}
return nil
} }
func (d *Driver) Stop() error { func (d *Driver) Stop() error {

View File

@ -351,7 +351,6 @@ func (c *ComputeUtil) stopInstance() error {
// startInstance starts the instance. // startInstance starts the instance.
func (c *ComputeUtil) startInstance() error { func (c *ComputeUtil) startInstance() error {
log.Infof("Starting instance.")
op, err := c.service.Instances.Start(c.project, c.zone, c.instanceName).Do() op, err := c.service.Instances.Start(c.project, c.zone, c.instanceName).Do()
if err != nil { if err != nil {
return err return err

View File

@ -385,25 +385,19 @@ func (d *Driver) Create() error {
} }
func (d *Driver) Start() error { func (d *Driver) Start() error {
log.Debug("Starting OpenStack instance...", map[string]string{"MachineId": d.MachineId})
if err := d.initCompute(); err != nil { if err := d.initCompute(); err != nil {
return err return err
} }
if err := d.client.StartInstance(d); err != nil {
return err return d.client.StartInstance(d)
}
return nil
} }
func (d *Driver) Stop() error { func (d *Driver) Stop() error {
if err := d.initCompute(); err != nil { if err := d.initCompute(); err != nil {
return err return err
} }
if err := d.client.StopInstance(d); err != nil {
return err
}
return nil return d.client.StopInstance(d)
} }
func (d *Driver) Remove() error { func (d *Driver) Remove() error {

View File

@ -481,12 +481,15 @@ func (d *Driver) Remove() error {
return nil return nil
} }
func (d *Driver) Restart() error { func (d *Driver) Restart() error {
return d.getClient().VirtualGuest().Reboot(d.Id) return d.getClient().VirtualGuest().Reboot(d.Id)
} }
func (d *Driver) Start() error { func (d *Driver) Start() error {
return d.getClient().VirtualGuest().PowerOn(d.Id) return d.getClient().VirtualGuest().PowerOn(d.Id)
} }
func (d *Driver) Stop() error { func (d *Driver) Stop() error {
return d.getClient().VirtualGuest().PowerOff(d.Id) return d.getClient().VirtualGuest().PowerOff(d.Id)
} }

View File

@ -481,7 +481,6 @@ func (d *Driver) Start() error {
if err := d.vbm("startvm", d.MachineName, "--type", "headless"); err != nil { if err := d.vbm("startvm", d.MachineName, "--type", "headless"); err != nil {
return err return err
} }
log.Infof("Starting VM...")
case state.Paused: case state.Paused:
if err := d.vbm("controlvm", d.MachineName, "resume", "--type", "headless"); err != nil { if err := d.vbm("controlvm", d.MachineName, "resume", "--type", "headless"); err != nil {
return err return err

View File

@ -376,7 +376,6 @@ func (d *Driver) Create() error {
} }
func (d *Driver) Start() error { func (d *Driver) Start() error {
log.Infof("Starting %s...", d.MachineName)
vmrun("start", d.vmxPath(), "nogui") vmrun("start", d.vmxPath(), "nogui")
// Do not execute the rest of boot2docker specific configuration, exit here // Do not execute the rest of boot2docker specific configuration, exit here

View File

@ -454,7 +454,6 @@ func (d *Driver) Remove() error {
} }
func (d *Driver) Start() error { func (d *Driver) Start() error {
p, err := govcloudair.NewClient() p, err := govcloudair.NewClient()
if err != nil { if err != nil {
return err return err
@ -542,7 +541,6 @@ func (d *Driver) Stop() error {
} }
func (d *Driver) Restart() error { func (d *Driver) Restart() error {
p, err := govcloudair.NewClient() p, err := govcloudair.NewClient()
if err != nil { if err != nil {
return err return err

View File

@ -565,7 +565,7 @@ func (d *Driver) Start() error {
if err != nil { if err != nil {
return err return err
} }
log.Infof("Powering on VM...")
task, err := vm.PowerOn(ctx) task, err := vm.PowerOn(ctx)
if err != nil { if err != nil {
return err return err

View File

@ -94,6 +94,7 @@ func (h *Host) runActionForState(action func() error, desiredState state.State)
} }
func (h *Host) Start() error { func (h *Host) Start() error {
log.Infof("Starting %q...", h.Name)
if err := h.runActionForState(h.Driver.Start, state.Running); err != nil { if err := h.runActionForState(h.Driver.Start, state.Running); err != nil {
return err return err
} }