NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "lock_driver: Introduce VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA"

Browse Source 
This reverts commit 997283b54b.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2018-10-02 15:09:58 +02:00
parent e24767eb41
commit cc5997a9ae
3 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/locking/lock_driver.h
View File

@ -51,8 +51,6 @@ typedef enum {
VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK = 0, VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK = 0,
/* A lease against an arbitrary resource */ /* A lease against an arbitrary resource */
VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE = 1, VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE = 1,
/* The resource to be locked is a metadata */
VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA = 2,
} virLockManagerResourceType; } virLockManagerResourceType;
typedef enum { typedef enum {

47
src/locking/lock_driver_lockd.c
View File

@ -563,7 +563,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
virLockManagerLockDaemonPrivatePtr priv = lock->privateData; virLockManagerLockDaemonPrivatePtr priv = lock->privateData;
char *newName = NULL; char *newName = NULL;
char *newLockspace = NULL; char *newLockspace = NULL;
int newFlags = 0; bool autoCreate = false;
int ret = -1; int ret = -1;
virCheckFlags(VIR_LOCK_MANAGER_RESOURCE_READONLY | virCheckFlags(VIR_LOCK_MANAGER_RESOURCE_READONLY |
@ -575,7 +575,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
switch (priv->type) { switch (priv->type) {
case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN: case VIR_LOCK_MANAGER_OBJECT_TYPE_DOMAIN:
switch ((virLockManagerResourceType) type) { switch (type) {
case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK: case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
if (params || nparams) { if (params || nparams) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -602,7 +602,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
VIR_DEBUG("Got an LVM UUID %s for %s", newName, name); VIR_DEBUG("Got an LVM UUID %s for %s", newName, name);
if (VIR_STRDUP(newLockspace, driver->lvmLockSpaceDir) < 0) if (VIR_STRDUP(newLockspace, driver->lvmLockSpaceDir) < 0)
goto cleanup; goto cleanup;
newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE; autoCreate = true;
break; break;
} }
virResetLastError(); virResetLastError();
@ -619,7 +619,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
VIR_DEBUG("Got an SCSI ID %s for %s", newName, name); VIR_DEBUG("Got an SCSI ID %s for %s", newName, name);
if (VIR_STRDUP(newLockspace, driver->scsiLockSpaceDir) < 0) if (VIR_STRDUP(newLockspace, driver->scsiLockSpaceDir) < 0)
goto cleanup; goto cleanup;
newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE; autoCreate = true;
break; break;
} }
virResetLastError(); virResetLastError();
@ -631,7 +631,7 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
goto cleanup; goto cleanup;
if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, name, &newName) < 0) if (virCryptoHashString(VIR_CRYPTO_HASH_SHA256, name, &newName) < 0)
goto cleanup; goto cleanup;
newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE; autoCreate = true;
VIR_DEBUG("Using indirect lease %s for %s", newName, name); VIR_DEBUG("Using indirect lease %s for %s", newName, name);
} else { } else {
if (VIR_STRDUP(newLockspace, "") < 0) if (VIR_STRDUP(newLockspace, "") < 0)
@ -676,8 +676,6 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
goto cleanup; goto cleanup;
} break; } break;
case VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA:
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown lock manager object type %d for domain lock object"), _("Unknown lock manager object type %d for domain lock object"),
@ -687,29 +685,6 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
break; break;
case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON: case VIR_LOCK_MANAGER_OBJECT_TYPE_DAEMON:
switch ((virLockManagerResourceType) type) {
case VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA:
if (params || nparams) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Unexpected parameters for metadata resource"));
goto cleanup;
}
if (VIR_STRDUP(newLockspace, "") < 0 ||
VIR_STRDUP(newName, name) < 0)
goto cleanup;
newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_METADATA;
break;
case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
case VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE:
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown lock manager object type %d for daemon lock object"),
type);
goto cleanup;
}
break;
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown lock manager object type %d"), _("Unknown lock manager object type %d"),
@ -717,15 +692,19 @@ static int virLockManagerLockDaemonAddResource(virLockManagerPtr lock,
goto cleanup; goto cleanup;
} }
if (flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)
newFlags |= VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED;
if (VIR_EXPAND_N(priv->resources, priv->nresources, 1) < 0) if (VIR_EXPAND_N(priv->resources, priv->nresources, 1) < 0)
goto cleanup; goto cleanup;
VIR_STEAL_PTR(priv->resources[priv->nresources-1].lockspace, newLockspace); VIR_STEAL_PTR(priv->resources[priv->nresources-1].lockspace, newLockspace);
VIR_STEAL_PTR(priv->resources[priv->nresources-1].name, newName); VIR_STEAL_PTR(priv->resources[priv->nresources-1].name, newName);
priv->resources[priv->nresources-1].flags = newFlags;
if (flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)
priv->resources[priv->nresources-1].flags |=
VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED;
if (autoCreate)
priv->resources[priv->nresources-1].flags |=
VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE;
ret = 0; ret = 0;
cleanup: cleanup:

3
src/locking/lock_driver_sanlock.c
View File

@ -811,7 +811,7 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY)
return 0; return 0;
switch ((virLockManagerResourceType) type) { switch (type) {
case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK: case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK:
if (driver->autoDiskLease) { if (driver->autoDiskLease) {
if (virLockManagerSanlockAddDisk(driver, lock, name, nparams, params, if (virLockManagerSanlockAddDisk(driver, lock, name, nparams, params,
@ -835,7 +835,6 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock,
return -1; return -1;
break; break;
case VIR_LOCK_MANAGER_RESOURCE_TYPE_METADATA:
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown lock manager object type %d for domain lock object"), _("Unknown lock manager object type %d for domain lock object"),