Skip to content

Fix snapshot deletion on template creation failure#9239

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

Merged
yadvr merged 2 commits into from
Sep 4, 2024
Merged

Fix snapshot deletion on template creation failure #9239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f028a23
Don't delete the snapshot itself on the primary storage upon any failure
harikrishna-patnala Jun 13, 2024
680e3c5
Change an if condition
harikrishna-patnala Jun 18, 2024
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
22 changes: 14 additions & 8 deletions server/src/main/java/org/apache/cloudstack/snapshot/SnapshotHelper.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,15 +101,21 @@ public void expungeTemporarySnapshot(boolean kvmSnapshotOnlyInPrimaryStorage, Sn
return;
}

logger.debug(String.format("Expunging snapshot [%s] due to it is a temporary backup to create a volume from snapshot. It is occurring because the global setting [%s]"
+ " has the value [%s].", snapInfo.getId(), SnapshotInfo.BackupSnapshotAfterTakingSnapshot.key(), backupSnapshotAfterTakingSnapshot));

try {
snapshotService.deleteSnapshot(snapInfo);
} catch (CloudRuntimeException ex) {
logger.warn(String.format("Unable to delete the temporary snapshot [%s] on secondary storage due to [%s]. We still will expunge the database reference, consider"
+ " manually deleting the file [%s].", snapInfo.getId(), ex.getMessage(), snapInfo.getPath()), ex);
if (!DataStoreRole.Image.equals(snapInfo.getDataStore().getRole())) {

@DaanHooglandDaanHooglandJun 18, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually still not sure it won't be a potential NPE ; snapInfo is not null but snapInfo.getDataStore() still may be.

@harikrishna-patnalaharikrishna-patnalaJun 18, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Datastore/Role cannot be null based on the existing method calls and it should not be null for further steps as well. Do you want me to keep a check anyways ?

@DaanHooglandDaanHooglandJun 19, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe you are right @harikrishna-patnala (probably actually) but in this public method a snapshotInfo object may be passed that is constructed with a null-datastore. I think an extra check does not hurt here.

logger.debug(String.format("Expunge template for Snapshot [%s] is called for primary storage role. Not expunging it, " +
"but we will still expunge the database reference of the snapshot for image storage role if any", snapInfo.getId()));
} else {
logger.debug(String.format("Expunging snapshot [%s] due to it is a temporary backup to create a volume from snapshot. It is occurring because the global setting [%s]"
+ " has the value [%s].", snapInfo.getId(), SnapshotInfo.BackupSnapshotAfterTakingSnapshot.key(), backupSnapshotAfterTakingSnapshot));

try {
snapshotService.deleteSnapshot(snapInfo);
} catch (CloudRuntimeException ex) {
logger.warn(String.format("Unable to delete the temporary snapshot [%s] on secondary storage due to [%s]. We still will expunge the database reference, consider"
+ " manually deleting the file [%s].", snapInfo.getId(), ex.getMessage(), snapInfo.getPath()), ex);
}
}

long storeId = snapInfo.getDataStore().getId();
if (!DataStoreRole.Image.equals(snapInfo.getDataStore().getRole())) {
long zoneId = dataStorageManager.getStoreZoneId(storeId, snapInfo.getDataStore().getRole());
Expand Down