Revision 3213d3c8
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
98 | 98 |
if result.failed: |
99 | 99 |
raise errors.HypervisorError("xm list failed, retries" |
100 | 100 |
" exceeded (%s): %s" % |
101 |
(result.fail_reason, result.stderr))
|
|
101 |
(result.fail_reason, result.output))
|
|
102 | 102 |
|
103 | 103 |
# skip over the heading |
104 | 104 |
lines = result.stdout.splitlines()[1:] |
... | ... | |
183 | 183 |
result = utils.RunCmd(command) |
184 | 184 |
|
185 | 185 |
if result.failed: |
186 |
raise errors.HypervisorError("Failed to stop instance %s: %s" % |
|
187 |
(instance.name, result.fail_reason)) |
|
186 |
raise errors.HypervisorError("Failed to stop instance %s: %s, %s" % |
|
187 |
(instance.name, result.fail_reason, |
|
188 |
result.output)) |
|
188 | 189 |
|
189 | 190 |
def RebootInstance(self, instance): |
190 | 191 |
"""Reboot an instance. |
... | ... | |
193 | 194 |
result = utils.RunCmd(["xm", "reboot", instance.name]) |
194 | 195 |
|
195 | 196 |
if result.failed: |
196 |
raise errors.HypervisorError("Failed to reboot instance %s: %s" % |
|
197 |
(instance.name, result.fail_reason)) |
|
197 |
raise errors.HypervisorError("Failed to reboot instance %s: %s, %s" % |
|
198 |
(instance.name, result.fail_reason, |
|
199 |
result.output)) |
|
198 | 200 |
|
199 | 201 |
def GetNodeInfo(self): |
200 | 202 |
"""Return information about the node. |
... | ... | |
263 | 265 |
""" |
264 | 266 |
result = utils.RunCmd(["xm", "info"]) |
265 | 267 |
if result.failed: |
266 |
return "'xm info' failed: %s" % result.fail_reason
|
|
268 |
return "'xm info' failed: %s, %s" % (result.fail_reason, result.output)
|
|
267 | 269 |
|
268 | 270 |
@staticmethod |
269 | 271 |
def _GetConfigFileDiskData(disk_template, block_devices): |
Also available in: Unified diff