Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use shared lock on disks for dependent VMs #178

Merged
merged 2 commits into from
Jun 24, 2022
Merged

Use shared lock on disks for dependent VMs #178

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a801422
core: extract template usage check
bennyz Jun 19, 2022
4c3ab00
core: only use a shared lock for thin template overlays
bennyz Jun 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions .../src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,10 @@ protected void tearDownImage(Guid vdsId, Guid backupId) {
boolean tearDownFailed = false;

if (getTransferBackend() == ImageTransferBackend.FILE) {
if (!Guid.Empty.equals(image.getImageTemplateId())) {
LockInfo lockInfo =
lockManager.getLockInfo(getImage().getImageTemplateId() + LockingGroup.TEMPLATE.toString());
if (isTemplateBeingUsed(image)) {
log.info("Transfer '{}': The template image is being used, skipping teardown", getCommandId());

if (lockInfo != null) {
log.info("The template image is used for image transfer '{}', skipping teardown", getCommandId());
return;
}
return;
}

VDSReturnValue teardownImageVdsRetVal = runVdsCommand(VDSCommandType.TeardownImage,
Expand All @@ -326,6 +322,18 @@ protected void tearDownImage(Guid vdsId, Guid backupId) {
}
}

private boolean isTemplateBeingUsed(DiskImage image) {
if (!Guid.Empty.equals(image.getImageTemplateId())) {
LockInfo lockInfo =
lockManager.getLockInfo(getDiskImage().getImageTemplateId() + LockingGroup.TEMPLATE.toString());
if (lockInfo != null) {
return true;
}
}

return false;
}

private boolean stopNbdServer(Guid vdsId) {
NbdServerVDSParameters nbdServerVDSParameters = new NbdServerVDSParameters(vdsId);
nbdServerVDSParameters.setServerId(getCommandId());
Expand Down Expand Up @@ -436,12 +444,18 @@ protected Map<String, Pair<String, String>> getSharedLocks() {
// StartVmBackup should handle locks
return locks;
}

if (!Guid.isNullOrEmpty(getParameters().getImageId()) && getDiskImage() != null) {
List<VM> vms = vmDao.getVmsListForDisk(getDiskImage().getId(), true);
vms.forEach(vm -> locks.put(vm.getId().toString(),
LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, getDiskIsBeingTransferredLockMessage())));
}

if (getDiskImage() != null && getParameters().getTransferType() == TransferType.Download) {
locks.put(getDiskImage().getId().toString(),
LockMessagesMatchUtil.makeLockingPair(LockingGroup.DISK, EngineMessage.ACTION_TYPE_FAILED_DISK_IS_LOCKED));
}

return locks;
}

Expand All @@ -458,7 +472,8 @@ protected Map<String, Pair<String, String>> getExclusiveLocks() {
// StartVmBackup should handle locks
return locks;
}
if (getDiskImage() != null) {

if (getDiskImage() != null && getParameters().getTransferType() == TransferType.Upload) {
locks.put(getDiskImage().getId().toString(),
LockMessagesMatchUtil.makeLockingPair(LockingGroup.DISK, getDiskIsBeingTransferredLockMessage()));
}
Expand Down