Merge branch 'fix-delete-snapshot-fail' into 'master'

<type>[snapshot]: fix batch delete volume snapshot timeout

See merge request zstackio/zstack!3478

Author: gitlab

storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotCascadeExtension.java

@@ -133,9 +133,18 @@ private void handleDeletion(final CascadeAction action, final Completion complet
             bus.makeTargetServiceIdByResourceUuid(omsg, VolumeConstant.SERVICE_ID, e.getKey());
 
             bus.send(omsg, new CloudBusCallBack(compl) {
-                private List<ErrorCode> buildErrorCodeFromReply(MulitpleOverlayReply reply) {
+                private List<ErrorCode> buildErrorCodeFromReply(MessageReply r) {
                     List<ErrorCode> errorCodes = new ArrayList<>();
                     Iterator<NeedReplyMessage> iterator = omsg.getMessages().iterator();
+                    if (!r.isSuccess()) {
+                        omsg.getMessages().forEach(m -> {
+                            ErrorCode error = r.getError().copy();
+                            error.putToOpaque(VolumeSnapshotConstant.SNAPSHOT_UUID, ((VolumeSnapshotDeletionMsg)iterator.next()).getSnapshotUuid());
+                            errorCodes.add(error);
+                        });
+                        return errorCodes;
+                    }
+                    MulitpleOverlayReply reply = (MulitpleOverlayReply)r;
                     reply.getInnerReplies().forEach(innerReply -> {
                         VolumeSnapshotDeletionMsg innerMsg = (VolumeSnapshotDeletionMsg)iterator.next();
                         if (!innerReply.isSuccess()) {
@@ -154,7 +163,7 @@ public void run(MessageReply reply) {
                         ext.volumeSnapshotAfterCleanUpExtensionPoint(volumeUuid, snapshotToDelete.get(volumeUuid));
                     });
 
-                    buildErrorCodeFromReply((MulitpleOverlayReply)reply).forEach(compl::addError);
+                    buildErrorCodeFromReply(reply).forEach(compl::addError);
                     compl.done();
                 }
             });