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

Perform cleanup after insufficient free space error during LSM #568

Merged
merged 2 commits into from
Aug 3, 2022
Merged

Perform cleanup after insufficient free space error during LSM #568

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd08c02
core: code improvements of LSM cleanup method
barpavel Aug 2, 2022
733e883
core: perform cleanup for failure during clone LSM phase
barpavel Aug 2, 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
33 changes: 19 additions & 14 deletions ...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 @@ -273,9 +273,10 @@ public boolean performNextOperation(int completedChildCount) {
}

updateStage(LiveDiskMigrateStage.SOURCE_IMAGE_DELETION);
removeImage(getParameters().getSourceStorageDomainId(), getParameters()
.getImageGroupID(), getParameters().getDestinationImageId(), AuditLogType
.USER_MOVE_IMAGE_GROUP_FAILED_TO_DELETE_SRC_IMAGE);
removeImage(getParameters().getSourceStorageDomainId(),
getParameters().getImageGroupID(),
getParameters().getDestinationImageId(),
AuditLogType.USER_MOVE_IMAGE_GROUP_FAILED_TO_DELETE_SRC_IMAGE);
updateStage(LiveDiskMigrateStage.LIVE_MIGRATE_DISK_EXEC_COMPLETED);
return true;
}
Expand Down Expand Up @@ -388,7 +389,7 @@ protected void endWithFailure() {
}

super.endWithFailure();
handleDestDisk();
cleanupDestDiskAfterFailure();

// Handle snapshot removal
log.info("Attempting to remove the auto-generated snapshot");
Expand Down Expand Up @@ -743,10 +744,13 @@ private String getDiskIsBeingMigratedMessage(Disk disk) {
+ String.format("$DiskName %1$s", disk != null ? disk.getDiskAlias() : "");
}

private void handleDestDisk() {
if (getParameters().getLiveDiskMigrateStage() != LiveDiskMigrateStage.CREATE_SNAPSHOT &&
getParameters().getLiveDiskMigrateStage() != LiveDiskMigrateStage.CLONE_IMAGE_STRUCTURE &&
getParameters().getLiveDiskMigrateStage() != LiveDiskMigrateStage.SOURCE_IMAGE_DELETION) {
private void cleanupDestDiskAfterFailure() {
if (getParameters().getLiveDiskMigrateStage() == LiveDiskMigrateStage.CREATE_SNAPSHOT ||
getParameters().getLiveDiskMigrateStage() == LiveDiskMigrateStage.SOURCE_IMAGE_DELETION) {
return;
}

if (getParameters().getLiveDiskMigrateStage() != LiveDiskMigrateStage.CLONE_IMAGE_STRUCTURE) {
if (Guid.Empty.equals(getParameters().getVdsId())) {
log.error("Failed during live storage migration of disk '{}' of vm '{}', as the vm is not running" +
" on any host not attempting to end the replication before the target disk deletion",
Expand All @@ -769,13 +773,14 @@ private void handleDestDisk() {
}
}
}

log.error("Attempting to delete the target of disk '{}' of vm '{}'",
getParameters().getImageGroupID(), getParameters().getVmId());
removeImage(getParameters().getTargetStorageDomainId(), getParameters()
.getImageGroupID(), getParameters().getDestinationImageId(), AuditLogType
.USER_MOVE_IMAGE_GROUP_FAILED_TO_DELETE_DST_IMAGE);
}

log.error("Attempting to delete the target of disk '{}' of vm '{}'",
getParameters().getImageGroupID(), getParameters().getVmId());
removeImage(getParameters().getTargetStorageDomainId(),
getParameters().getImageGroupID(),
getParameters().getDestinationImageId(),
AuditLogType.USER_MOVE_IMAGE_GROUP_FAILED_TO_DELETE_DST_IMAGE);
}

@Override
Expand Down