3:44 p.m.
This is a backport of:
https://www.redhat.com/archives/libvir-list/2013-June/msg00453.html
submitted upstread as commit id 'b2375453' and '38ada092'
John Ferlan (2):
qemu: Resolve issue with GetScheduler APIs for non running domain
lxc: Resolve issue with GetScheduler APIs for non running domain
src/lxc/lxc_driver.c | 11 ++++++++++-
src/qemu/qemu_driver.c | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
--
1.8.1.4
3:44 p.m.
New subject: [libvirt] [PATCH for v1.0.5-maint 1/2] qemu: Resolve issue with GetScheduler APIs for non running domain
As a consequence of the cgroup layout changes from commit '632f78ca', the
qemuDomainGetSchedulerParameters[Flags]()' and qemuGetSchedulerType() APIs
failed to return data for a non running domain. This can be seen through
a 'virsh schedinfo <domain>' command which returns:
Scheduler : Unknown
error: Requested operation is not valid: cgroup CPU controller is not mounted
Prior to that change a non running domain would return:
Scheduler : posix
cpu_shares : 0
vcpu_period : 0
vcpu_quota : 0
emulator_period: 0
emulator_quota : 0
This patch will restore the capability to return configuration only data
for a non running domain regardless of whether cgroups are available.
NOTE: Needed to change the VIR_STRDUP(ret, "posix"); to ret =
strdup("posix");
---
src/qemu/qemu_driver.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 31b2f85..09963b4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -6619,6 +6619,14 @@ static char *qemuDomainGetSchedulerType(virDomainPtr dom,
}
priv = vm->privateData;
+ /* Domain not running, thus no cgroups - return defaults */
+ if (!virDomainObjIsActive(vm)) {
+ if (nparams)
+ *nparams = 5;
+ ret = strdup("posix");
+ goto cleanup;
+ }
+
if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU)) {
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("cgroup CPU controller is not
mounted"));
@@ -8038,11 +8046,12 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr dom,
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
shares = persistentDef->cputune.shares;
- if (*nparams > 1 && cpu_bw_status) {
+ if (*nparams > 1) {
period = persistentDef->cputune.period;
quota = persistentDef->cputune.quota;
emulator_period = persistentDef->cputune.emulator_period;
emulator_quota = persistentDef->cputune.emulator_quota;
+ cpu_bw_status = true; /* Allow copy of data to params[] */
}
goto out;
}
--
1.8.1.4
3:18 a.m.
New subject: [libvirt] [PATCH for v1.0.5-maint 1/2] qemu: Resolve issue with GetScheduler APIs for non running domain
On 06/19/2013 10:44 PM, John Ferlan wrote:
As a consequence of the cgroup layout changes from commit
'632f78ca', the
qemuDomainGetSchedulerParameters[Flags]()' and qemuGetSchedulerType() APIs
failed to return data for a non running domain. This can be seen through
a 'virsh schedinfo <domain>' command which returns:
Scheduler : Unknown
error: Requested operation is not valid: cgroup CPU controller is not mounted
Prior to that change a non running domain would return:
Scheduler : posix
cpu_shares : 0
vcpu_period : 0
vcpu_quota : 0
emulator_period: 0
emulator_quota : 0
This patch will restore the capability to return configuration only data
for a non running domain regardless of whether cgroups are available.
NOTE: Needed to change the VIR_STRDUP(ret, "posix"); to ret =
strdup("posix");
VIR_STRDUP also reports the OOM error, so the strdup equivalent would be:
if (!(ret = strdup("posix")))
virReportOOMError();
Jan
9:44 a.m.
New subject: [libvirt] [PATCH for v1.0.5-maint 1/2] qemu: Resolve issue with GetScheduler APIs for non running domain
On 06/20/2013 04:18 AM, Ján Tomko wrote:
On 06/19/2013 10:44 PM, John Ferlan wrote:
> As a consequence of the cgroup layout changes from commit '632f78ca', the
> qemuDomainGetSchedulerParameters[Flags]()' and qemuGetSchedulerType() APIs
> failed to return data for a non running domain. This can be seen through
> a 'virsh schedinfo <domain>' command which returns:
>
> Scheduler : Unknown
> error: Requested operation is not valid: cgroup CPU controller is not mounted
>
> Prior to that change a non running domain would return:
>
> Scheduler : posix
> cpu_shares : 0
> vcpu_period : 0
> vcpu_quota : 0
> emulator_period: 0
> emulator_quota : 0
>
> This patch will restore the capability to return configuration only data
> for a non running domain regardless of whether cgroups are available.
>
> NOTE: Needed to change the VIR_STRDUP(ret, "posix"); to ret =
strdup("posix");
VIR_STRDUP also reports the OOM error, so the strdup equivalent would be:
if (!(ret = strdup("posix")))
virReportOOMError();
Jan
Ah yes, how quickly we forget.
I added/squashed in a check for the OOM and pushed along with the git
commit id from whence I cherry picked.
John
3:44 p.m.
New subject: [libvirt] [PATCH for v1.0.5-maint 2/2] lxc: Resolve issue with GetScheduler APIs for non running domain
As a consequence of the cgroup layout changes from commit 'cfed9ad4', the
lxcDomainGetSchedulerParameters[Flags]()' and lxcGetSchedulerType() APIs
failed to return data for a non running domain. This can be seen through
a 'virsh schedinfo <domain>' command which returns:
Scheduler : Unknown
error: Requested operation is not valid: cgroup CPU controller is not mounted
Prior to that change a non running domain would return:
Scheduler : posix
cpu_shares : 0
vcpu_period : 0
vcpu_quota : 0
emulator_period: 0
emulator_quota : 0
This patch will restore the capability to return configuration only data
for a non running domain regardless of whether cgroups are available.
NOTE: Needed to change the VIR_STRDUP(ret, "posix"); to ret =
strdup("posix");
---
src/lxc/lxc_driver.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 0becdc7..76dbfba 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1613,6 +1613,14 @@ static char *lxcDomainGetSchedulerType(virDomainPtr dom,
}
priv = vm->privateData;
+ /* Domain not running, thus no cgroups - return defaults */
+ if (!virDomainObjIsActive(vm)) {
+ if (nparams)
+ *nparams = 3;
+ ret = strdup("posix");
+ goto cleanup;
+ }
+
if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPU)) {
virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("cgroup CPU controller is not
mounted"));
@@ -1893,9 +1901,10 @@ lxcDomainGetSchedulerParametersFlags(virDomainPtr dom,
if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
shares = persistentDef->cputune.shares;
- if (*nparams > 1 && cpu_bw_status) {
+ if (*nparams > 1) {
period = persistentDef->cputune.period;
quota = persistentDef->cputune.quota;
+ cpu_bw_status = true; /* Allow copy of data to params[] */
}
goto out;
}
--
1.8.1.4
4173
days inactive
4174
days old
4 comments
2 participants
participants (2)
-
John Ferlan -
Ján Tomko