Skip to content

core: Use correct locks while running live migration of multiple disks of one VM #1010

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

Open
sermakov-orion wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

core: Use correct locks while running live migration of multiple disks of one VM #1010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion ...dules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDiskCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public boolean performNextOperation(int completedChildCount) {
// at the end of CreateSnapshotForVm command called from the executeCommand() method.
// Here the lock is acquired again and will be released when this command (LiveMigrateDisk)
// finishes.
EngineLock removeSnapshotLock = createEngineLockForSnapshotRemove();
EngineLock removeSnapshotLock = getEngineLockForSnapshotRemove();
if (!lockManager.acquireLock(removeSnapshotLock).isAcquired()) {
log.info("Failed to acquire VM lock, will retry on the next polling cycle");
return true;
Expand Down Expand Up @@ -378,6 +378,17 @@ private EngineLock createEngineLockForSnapshotRemove() {
getSharedLocksForSnapshotRemove());
}

private EngineLock getEngineLockForSnapshotRemove() {
EngineLock lock = getLock();
if (lock != null && !lock.getExclusiveLocks().isEmpty()) {
// In the generic scenario, use the lock created by the MigrateDiskCommand
return lock;
}
// This happens when the engine was restarted during active live disk migration. Use special lock to clean up
// temporary VM snapshot created by the migration
return createEngineLockForSnapshotRemove();
}

private boolean isConsiderSuccessful() {
return getParameters().getLiveDiskMigrateStage() == LiveDiskMigrateStage.AUTO_GENERATED_SNAPSHOT_REMOVE_END;
}
Expand Down