Fix of publish event for deleted snapshot

Author: slavkap

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImpl.java

@@ -191,6 +191,7 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
 
         searchBySnapshotId = createSearchBuilder();
         searchBySnapshotId.and(SNAPSHOT_ID, searchBySnapshotId.entity().getSnapshotId(), SearchCriteria.Op.EQ);
+        searchBySnapshotId.and(STATE, searchBySnapshotId.entity().getState(), SearchCriteria.Op.EQ);
         searchBySnapshotId.done();
 
         return true;
@@ -426,6 +427,7 @@ public List<SnapshotDataStoreVO> listReadyBySnapshot(long snapshotId, DataStoreR
     @Override
     public List<SnapshotDataStoreVO> listReadyBySnapshotId(long snapshotId) {
         SearchCriteria<SnapshotDataStoreVO> sc = searchBySnapshotId.create();
+        sc.setParameters(SNAPSHOT_ID, snapshotId);
         sc.setParameters(STATE, State.Ready);
         return listBy(sc);
     }

plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java

@@ -367,6 +367,8 @@ private boolean deleteSnapshotFromDbIfNeeded(SnapshotVO snapshotVO, Long zoneId)
         List<SnapshotDataStoreVO> storeRefs = _snapshotStoreDao.listBySnapshotAndDataStoreRole(snapshotId, DataStoreRole.Image);
         if (zoneId != null) {
             storeRefs.removeIf(ref -> !zoneId.equals(dataStoreMgr.getStoreZoneId(ref.getDataStoreId(), ref.getRole())));
+        } else {
+            storeRefs.removeIf(ref -> !ref.getState().equals(State.Ready));
         }
         for (SnapshotDataStoreVO ref : storeRefs) {
             if (!deleteSnapshotOnImageAndPrimary(snapshotId, dataStoreMgr.getDataStore(ref.getDataStoreId(), ref.getRole()))) {

server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java

@@ -904,8 +904,7 @@ public boolean deleteSnapshot(long snapshotId, Long zoneId) {
         boolean result = snapshotStrategy.deleteSnapshot(snapshotId, zoneId);
         if (result) {
             for (Long zId : zoneIds) {
-                List<SnapshotDataStoreVO> listActiveSnapshots = _snapshotStoreDao.listReadyBySnapshotId(snapshotId);
-                if (snapshotCheck.getState() == Snapshot.State.BackedUp && CollectionUtils.isEmpty(listActiveSnapshots)) {
+                if (snapshotCheck.getState() == Snapshot.State.BackedUp) {
                     UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_DELETE, snapshotCheck.getAccountId(), zId, snapshotId,
                             snapshotCheck.getName(), null, null, 0L, snapshotCheck.getClass().getName(), snapshotCheck.getUuid());
                 }
@@ -1738,7 +1737,7 @@ private boolean copySnapshotOnPool(SnapshotInfo snapshot, SnapshotStrategy snaps
             _resourceLimitMgr.incrementResourceCount(CallContext.current().getCallingUserId(), ResourceType.primary_storage, snapshot.getSize());
             if (CallContext.current().getCallingUserId() != Account.ACCOUNT_ID_SYSTEM) {
                 SnapshotVO snapshotVO = _snapshotDao.findByIdIncludingRemoved(snapshot.getSnapshotId());
-                UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_COPY, CallContext.current().getCallingUserId(), snapshotOnStore.getDataCenterId(), snapshotVO.getId(), null, null, null, snapshotVO.getSize(),
+                UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_COPY, CallContext.current().getCallingAccountId(), snapshotOnStore.getDataCenterId(), snapshotVO.getId(), null, null, null, snapshotVO.getSize(),
                         snapshotVO.getSize(), snapshotVO.getClass().getName(), snapshotVO.getUuid());
             }
         } catch (InterruptedException | ExecutionException e) {

server/src/main/java/org/apache/cloudstack/snapshot/SnapshotHelper.java

@@ -345,7 +345,7 @@ public List<Long> addStoragePoolsForCopyToPrimary(VolumeInfo volume, List<Long>
             if (volume == null) {
                 throw new InvalidParameterValueException("Could not find volume of a snapshot");
             }
-            if (CollectionUtils.isEmpty(destZoneIds) && CollectionUtils.isEmpty(storagePoolIds)) {
+            if (CollectionUtils.isEmpty(destZoneIds)) {
                 throw new InvalidParameterValueException("There is no destination zone provided");
             }
             if (CollectionUtils.isEmpty(storagePoolIds)) {