small rearranges

Author: slavkap

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

@@ -46,7 +46,6 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy;
 import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
-import org.apache.cloudstack.storage.command.CreateObjectAnswer;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
@@ -199,8 +198,10 @@ private void cleanUpDestroyedRecords(Long snapshotId) {
 
     private void processResult(List<SnapshotInfo> snapshotInfos, ObjectInDataStoreStateMachine.Event event) {
         for (SnapshotInfo snapshot : snapshotInfos) {
-                SnapshotObject snapshotObject = (SnapshotObject) snapshot;
+            SnapshotObject snapshotObject = (SnapshotObject) snapshot;
+            if (DataStoreRole.Primary.equals(snapshotObject.getDataStore().getRole())) {
                 snapshotObject.processEvent(event);
+            }
         }
     }
 
@@ -363,7 +364,7 @@ private boolean deleteSnapshotFromDbIfNeeded(SnapshotVO snapshotVO, Long zoneId)
                 !Snapshot.State.Destroying.equals(snapshotVO.getState())) {
             throw new InvalidParameterValueException(String.format("Can't delete snapshot %s due to it is in %s Status", snapshotVO, snapshotVO.getState()));
         }
-        List<SnapshotDataStoreVO> storeRefs = _snapshotStoreDao.listReadyBySnapshot(snapshotId, DataStoreRole.Image);
+        List<SnapshotDataStoreVO> storeRefs = _snapshotStoreDao.listBySnapshot(snapshotId, DataStoreRole.Image);
         if (zoneId != null) {
             storeRefs.removeIf(ref -> !zoneId.equals(dataStoreMgr.getStoreZoneId(ref.getDataStoreId(), ref.getRole())));
         }
@@ -413,17 +414,16 @@ public void copySnapshot(DataObject snapshot, DataObject snapshotDest, AsyncComp
         StoragePoolVO storagePoolVO = _primaryDataStoreDao.findById(snapshotDest.getDataStore().getId());
         String location = StorPoolConfigurationManager.StorPoolClusterLocation.valueIn(snapshotDest.getDataStore().getId());
         StorPoolUtil.spLog("StorpoolSnapshotStrategy.copySnapshot: snapshot %s to pool=%s", snapshot.getUuid(), storagePoolVO.getName());
-        CreateCmdResult res = null;
         SnapshotInfo srcSnapshot = (SnapshotInfo) snapshot;
         SnapshotInfo destSnapshot = (SnapshotInfo) snapshotDest;
         String err = null;
         String snapshotName = StorPoolStorageAdaptor.getVolumeNameFromPath(srcSnapshot.getPath(), false);
         if (location != null) {
             SpApiResponse resp = exportSnapshot(snapshot, location, snapshotName);
             if (resp.getError() != null) {
-                StorPoolUtil.spLog("Failed to export snapshot %s from %s due to %s", snapshotName, location, resp.getError());
-                err = String.format("Failed to export snapshot %s from %s due to %s", snapshotName, location, resp.getError());
-                completeCallback(callback, res, destSnapshot.getPath(), err);
+                err = String.format("Failed to export snapshot [{}] from [{}] due to [{}]", snapshotName, location, resp.getError());
+                StorPoolUtil.spLog(err);
+                completeCallback(callback, destSnapshot.getPath(), err);
                 return;
             }
             keepExportedSnapshot(snapshot, location, snapshotName);
@@ -433,32 +433,31 @@ public void copySnapshot(DataObject snapshot, DataObject snapshotDest, AsyncComp
             SpApiResponse respFromRemote = copySnapshotFromRemote(snapshot, storagePoolVO, snapshotName, connectionRemote);
 
             if (respFromRemote.getError() != null) {
-                StorPoolUtil.spLog("Failed to copy snapshot %s to %s due to %s", snapshotName, location, respFromRemote.getError());
-                err = String.format("Failed to copy snapshot %s to %s due to %s", snapshotName, location, respFromRemote.getError());
-                completeCallback(callback, res, destSnapshot.getPath(), err);
+                err = String.format("Failed to copy snapshot [{}] to [{}] due to [{}]", snapshotName, location, respFromRemote.getError());
+                StorPoolUtil.spLog(err);
+                completeCallback(callback, destSnapshot.getPath(), err);
                 return;
             }
             StorPoolUtil.spLog("The snapshot [%s] was copied from remote", snapshotName);
 
             respFromRemote = StorPoolUtil.snapshotReconcile("~" + snapshotName, connectionRemote);
             if (respFromRemote.getError() != null) {
-                StorPoolUtil.spLog("Failed to reconcile snapshot %s from %s due to %s", snapshotName, location, respFromRemote.getError());
-                err = String.format("Failed to reconcile snapshot %s from %s due to %s", snapshotName, location, respFromRemote.getError());
-                completeCallback(callback, res, destSnapshot.getPath(), err);
+                err = String.format("Failed to reconcile snapshot [{}] from [{}] due to [{}]", snapshotName, location, respFromRemote.getError());
+                StorPoolUtil.spLog(err);
+                completeCallback(callback, destSnapshot.getPath(), err);
                 return;
             }
             updateSnapshotPath(snapshotDest, srcSnapshot, destSnapshot);
         } else {
-            completeCallback(callback, res, destSnapshot.getPath(), "The snapshot is not in the right location");
+            completeCallback(callback, destSnapshot.getPath(), "The snapshot is not in the right location");
         }
         SnapshotObjectTO snap = (SnapshotObjectTO) snapshotDest.getTO();
         snap.setPath(srcSnapshot.getPath());
-        CreateObjectAnswer answer = new CreateObjectAnswer(snap);
-        completeCallback(callback, res, destSnapshot.getPath(), err);
+        completeCallback(callback, destSnapshot.getPath(), err);
     }
 
-    private void completeCallback(AsyncCompletionCallback<CreateCmdResult> callback, CreateCmdResult res, String snapshotPath, String err) {
-        res = new CreateCmdResult(snapshotPath, null);
+    private void completeCallback(AsyncCompletionCallback<CreateCmdResult> callback, String snapshotPath, String err) {
+        CreateCmdResult res = new CreateCmdResult(snapshotPath, null);
         res.setResult(err);
         callback.complete(res);
     }