Revision 1122eb25 lib/hypervisor/hv_kvm.py
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 240 | 240 |
@return: tuple (name, id, memory, vcpus, stat, times) |
| 241 | 241 |
|
| 242 | 242 |
""" |
| 243 |
pidfile, pid, alive = self._InstancePidAlive(instance_name)
|
|
| 243 |
_, pid, alive = self._InstancePidAlive(instance_name)
|
|
| 244 | 244 |
if not alive: |
| 245 | 245 |
return None |
| 246 | 246 |
|
| ... | ... | |
| 278 | 278 |
if utils.IsProcessAlive(utils.ReadPidFile(filename)): |
| 279 | 279 |
try: |
| 280 | 280 |
info = self.GetInstanceInfo(name) |
| 281 |
except errors.HypervisorError, err:
|
|
| 281 |
except errors.HypervisorError: |
|
| 282 | 282 |
continue |
| 283 | 283 |
if info: |
| 284 | 284 |
data.append(info) |
| ... | ... | |
| 470 | 470 |
@param incoming: (target_host_ip, port) |
| 471 | 471 |
|
| 472 | 472 |
""" |
| 473 |
pidfile, pid, alive = self._InstancePidAlive(instance.name)
|
|
| 473 |
pidfile, _, alive = self._InstancePidAlive(instance.name)
|
|
| 474 | 474 |
hvp = instance.hvparams |
| 475 | 475 |
if alive: |
| 476 | 476 |
raise errors.HypervisorError("Failed to start instance %s: %s" %
|
| ... | ... | |
| 581 | 581 |
# For some reason if we do a 'send-key ctrl-alt-delete' to the control |
| 582 | 582 |
# socket the instance will stop, but now power up again. So we'll resort |
| 583 | 583 |
# to shutdown and restart. |
| 584 |
pidfile, pid, alive = self._InstancePidAlive(instance.name)
|
|
| 584 |
_, _, alive = self._InstancePidAlive(instance.name)
|
|
| 585 | 585 |
if not alive: |
| 586 | 586 |
raise errors.HypervisorError("Failed to reboot instance %s:"
|
| 587 | 587 |
" not running" % instance.name) |
Also available in: Unified diff