CSTACKEX-16 Fix locationType in framework

Author: Gupta, Surya

engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/StorageSystemSnapshotStrategy.java

@@ -116,6 +116,7 @@ public SnapshotInfo backupSnapshot(SnapshotInfo snapshotInfo) {
         Preconditions.checkArgument(snapshotInfo != null, "'snapshotInfo' cannot be 'null'.");
 
         if (snapshotInfo.getLocationType() != Snapshot.LocationType.SECONDARY) {
+            logger.info("backupSnapshot markAsBackedUp");
             markAsBackedUp((SnapshotObject)snapshotInfo);
             return snapshotInfo;
         }
@@ -124,7 +125,7 @@ public SnapshotInfo backupSnapshot(SnapshotInfo snapshotInfo) {
         // snapshot on the storage or exists as a volume on the storage (clone).
         // If archive flag is passed in, we should copy this snapshot to secondary
         // storage and delete it from primary storage.
-
+        logger.info("backupSnapshot copy to secondary storage");
         HostVO host = getHost(snapshotInfo.getVolumeId());
 
         boolean canStorageSystemCreateVolumeFromSnapshot = canStorageSystemCreateVolumeFromSnapshot(snapshotInfo.getBaseVolume().getPoolId());

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

@@ -1793,6 +1793,7 @@ protected void backupSnapshotToSecondary(boolean asyncBackup, SnapshotStrategy s
         if (asyncBackup) {
             backupSnapshotExecutor.schedule(new BackupSnapshotTask(snapshotOnPrimary, snapshotBackupRetries - 1, snapshotStrategy, zoneIds, poolIds), 0, TimeUnit.SECONDS);
         } else {
+            logger.info("backupSnapshotToSecondary: Backing up snapshot [{}]", snapshotOnPrimary.toString());
             SnapshotInfo backedUpSnapshot = snapshotStrategy.backupSnapshot(snapshotOnPrimary);
             if (backedUpSnapshot != null) {
                 snapshotStrategy.postSnapshotCreation(snapshotOnPrimary);
@@ -1850,11 +1851,12 @@ private void decriseBackupSnapshotAttempts() {
     }
 
     private void updateSnapshotPayload(long storagePoolId, CreateSnapshotPayload payload, boolean isKvmAndFileBasedStorage, Long clusterId) {
+        logger.info("updateSnapshotPayload: storagePoolId={}, isKvmAndFileBasedStorage={}, clusterId={}", storagePoolId, isKvmAndFileBasedStorage, clusterId);
         StoragePoolVO storagePoolVO = _storagePoolDao.findById(storagePoolId);
 
         if (storagePoolVO.isManaged()) {
             Snapshot.LocationType locationType = payload.getLocationType();
-
+            logger.info("updateSnapshotPayload : locationType {}", locationType);
             if (locationType == null) {
                 if (!isKvmAndFileBasedStorage) {
                     // For managed, non-file-based storage (e.g., iSCSI), default to SECONDARY
@@ -1873,6 +1875,8 @@ private void updateSnapshotPayload(long storagePoolId, CreateSnapshotPayload pay
         if (isKvmAndFileBasedStorage && kvmIncrementalSnapshot.valueIn(clusterId)) {
             payload.setKvmIncrementalSnapshot(true);
         }
+        logger.info("updateSnapshotPayload : payload {}", payload);
+        logger.info("updateSnapshotPayload : payload.getLocationType() {}", payload.getLocationType());
     }
 
     @Override