External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-02 19:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvz: Handle domain obj hash map errors

Browse Source 
This makes the driver fail with a clear error message in case of UUID
collisions (for example if somebody copied a container configuration
without updating the UUID) and also raises an error on other hash map
failures.

OpenVZ itself doesn't complain about duplicate UUIDs since this
parameter is only used by libvirt.
(cherry picked from commit 31351c316f)
This commit is contained in:
Guido Günther 2012-07-09 12:11:17 +02:00 committed by Cole Robinson
parent 00b610c8e9
commit f7ebe9d012
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openvz/openvz_conf.c
View File

@ -537,8 +537,18 @@ int openvzLoadDomains(struct openvz_driver *driver) {
openvzReadFSConf(dom->def, veid);
virUUIDFormat(dom->def->uuid, uuidstr);
if (virHashAddEntry(driver->domains.objs, uuidstr, dom) < 0)
if (virHashLookup(driver->domains.objs, uuidstr)) {
openvzError(VIR_ERR_INTERNAL_ERROR,
_("Duplicate container UUID %s detected for %d"),
uuidstr,
veid);
goto cleanup;
}
if (virHashAddEntry(driver->domains.objs, uuidstr, dom) < 0) {
openvzError(VIR_ERR_INTERNAL_ERROR,
_("Could not add UUID for container %d"), veid);
goto cleanup;
}
virDomainObjUnlock(dom);
dom = NULL;