mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Cope with the ValueError exception that we get if you use Xend with the recent
change to parsing memory configuration against a store with entries written by an older Xend. Added maxmem field to list of things to be read from the store on recreate.
This commit is contained in:
1 parent
e7570f0014
commit
19744cdc5f
1 file changed
+12
-1
@@ -393,11 +393,22 @@ class XendDomainInfo:
|
||||
("on_crash", str),
|
||||
("image", str),
|
||||
("memory", int),
|
||||
("maxmem", int),
|
||||
("vcpus", int),
|
||||
("vcpu_avail", int),
|
||||
("start_time", float))
|
||||
|
||||
from_store = self.gatherVm(*params)
|
||||
try:
|
||||
from_store = self.gatherVm(*params)
|
||||
except ValueError, exn:
|
||||
# One of the int/float entries in params has a corresponding store
|
||||
# entry that is invalid. We recover, because older versions of
|
||||
# Xend may have put the entry there (memory/target, for example),
|
||||
# but this is in general a bad situation to have reached.
|
||||
log.exception(
|
||||
"Store corrupted at %s! Domain %d's configuration may be "
|
||||
"affected.", self.vmpath, self.domid)
|
||||
return
|
||||
|
||||
map(lambda x, y: useIfNeeded(x[0], y), params, from_store)
|
||||
|
||||
|
||||