提交 3a6cf6fc 编写于 作者: O Olga Krishtal 提交者: Maxim Nestratov

vz: fixed race in vzDomainAttach/DettachDevice

While dettaching/attaching device in OpenStack, nova
calls vzDomainDettachDevice twice, because the update of the internal
configuration of the ct comes a bit latter than the update event.
As the result, we suffer from the second call to dettach the same device.
Signed-off-by: NOlga Krishtal <okrishtal@virtuozzo.com>
上级 2354266a
......@@ -3600,6 +3600,12 @@ prlsdkAttachDevice(vzDriverPtr driver,
return -1;
}
if (prlsdkUpdateDomain(driver, dom) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to save new config"));
return -1;
}
job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE);
if (PRL_FAILED(waitDomainJob(job, dom)))
return -1;
......@@ -3667,6 +3673,12 @@ prlsdkDetachDevice(vzDriverPtr driver,
goto cleanup;
}
if (prlsdkUpdateDomain(driver, dom) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to save new config"));
goto cleanup;
}
job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE);
if (PRL_FAILED(waitDomainJob(job, dom)))
goto cleanup;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册