提交 963a5b7a 编写于 作者: C Chris Lalancette

Make virsh setmaxmem balloon only when successful.

After playing around with virsh setmaxmem for a bit,
I ran into some surprising behavior; if a hypervisor does
not support the virDomainSetMaxMemory() API, but the value
specified for setmaxmem is less than the current amount
of memory in the domain, the domain would be ballooned
down *before* an error was reported.

To make this more consistent, run virDomainSetMaxMemory()
before trying to shrink; that way, if an error is thrown,
no changes to the running domain are made.
Signed-off-by: NChris Lalancette <clalance@redhat.com>
上级 4af1817d
...@@ -2596,18 +2596,18 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) ...@@ -2596,18 +2596,18 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd)
return FALSE; return FALSE;
} }
if (kilobytes < info.memory) { if (virDomainSetMaxMemory(dom, kilobytes) != 0) {
if (virDomainSetMemory(dom, kilobytes) != 0) { vshError(ctl, "%s", _("Unable to change MaxMemorySize"));
virDomainFree(dom); virDomainFree(dom);
vshError(ctl, "%s", _("Unable to shrink current MemorySize"));
return FALSE; return FALSE;
} }
}
if (virDomainSetMaxMemory(dom, kilobytes) != 0) { if (kilobytes < info.memory) {
vshError(ctl, "%s", _("Unable to change MaxMemorySize")); if (virDomainSetMemory(dom, kilobytes) != 0) {
vshError(ctl, "%s", _("Unable to shrink current MemorySize"));
ret = FALSE; ret = FALSE;
} }
}
virDomainFree(dom); virDomainFree(dom);
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册