DaanHoogland commented on a change in pull request #3969: Snapshot deletion
issues
URL: https://github.com/apache/cloudstack/pull/3969#discussion_r404344872
##########
File path:
engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
##########
@@ -257,21 +257,23 @@ public boolean deleteSnapshot(Long snapshotId) {
return true;
}
- if (!Snapshot.State.BackedUp.equals(snapshotVO.getState()) &&
!Snapshot.State.Error.equals(snapshotVO.getState()) &&
+ if (!Snapshot.State.BackedUp.equals(snapshotVO.getState()) &&
!Snapshot.State.Destroying.equals(snapshotVO.getState())) {
throw new InvalidParameterValueException("Can't delete
snapshotshot " + snapshotId + " due to it is in " + snapshotVO.getState() + "
Status");
}
- boolean deletedOnSecondary = deleteOnSecondaryIfNeeded(snapshotId);
+ Boolean deletedOnSecondary = deleteOnSecondaryIfNeeded(snapshotId);
boolean deletedOnPrimary = deleteOnPrimaryIfNeeded(snapshotId);
if (deletedOnPrimary) {
s_logger.debug(String.format("Successfully deleted snapshot (id:
%d) on primary storage.", snapshotId));
- } else if (deletedOnSecondary) {
- s_logger.debug(String.format("The snapshot was deleted on
secondary storage. Could not find/delete snapshot (id: %d) on primary
storage.", snapshotId));
+ } else {
+ s_logger.debug(String.format("The snapshot (id: %d) could not be
found/deleted on primary storage.", snapshotId));
}
-
- return deletedOnSecondary || deletedOnPrimary;
+ if (null == deletedOnSecondary && deletedOnSecondary) {
Review comment:
yes should be !=, tnx (it's late)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
