Make global setting non-dynamic

Author: Pearl Dsilva

engine/components-api/src/main/java/com/cloud/storage/StorageManager.java

@@ -113,7 +113,7 @@ public interface StorageManager extends StorageService {
             "In second, timeout for download template to primary storage", false);
 
     ConfigKey<Integer>  SecStorageMaxMigrateSessions = new ConfigKey<Integer>("Advanced", Integer.class, "secstorage.max.migrate.sessions", "2",
-            "The max number of concurrent copy command execution sessions that an SSVM can handle", true, ConfigKey.Scope.Global);
+            "The max number of concurrent copy command execution sessions that an SSVM can handle", false, ConfigKey.Scope.Global);
 
     ConfigKey<Integer> MaxDataMigrationWaitTime = new ConfigKey<Integer>("Advanced", Integer.class, "max.data.migration.wait.time", "15",
             "Maximum wait time for a data migration task before spawning a new SSVM", false, ConfigKey.Scope.Global);

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java

@@ -37,6 +37,7 @@
 import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
 import org.apache.cloudstack.framework.async.AsyncRpcContext;
+import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
@@ -65,6 +66,8 @@ public class SecondaryStorageServiceImpl implements SecondaryStorageService {
     SnapshotDataStoreDao snapshotStoreDao;
     @Inject
     VolumeDataStoreDao volumeDataStoreDao;
+    @Inject
+    private ObjectInDataStoreManager objectInStoreMgr;
 
     private class MigrateDataContext<T> extends AsyncRpcContext<T> {
         final DataObject srcData;
@@ -137,7 +140,7 @@ public AsyncCallFuture<DataObjectResult> migrateData(DataObject srcDataObject, D
             s_logger.debug("Failed to copy Data", e);
             if (destDataObject != null) {
                 s_logger.info("Deleting data on destination store: " + destDataObject.getDataStore().getName());
-                destDataObject.getDataStore().delete(destDataObject);
+                objectInStoreMgr.delete(destDataObject);
             }
             if (!(srcDataObject instanceof VolumeInfo)) {
                 srcDataObject.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed);
@@ -182,7 +185,7 @@ protected Void migrateDataCallBack(AsyncCallbackDispatcher<SecondaryStorageServi
                 }
 
                 if (destData != null) {
-                    destData.getDataStore().delete(destData);
+                    objectInStoreMgr.delete(destData);
                 }
             } else {
                 if (destData instanceof  VolumeInfo) {

engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java

@@ -88,6 +88,7 @@
 import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.Proxy;
+import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.dao.SecondaryStorageVmDao;
 
 public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver {
@@ -344,7 +345,7 @@ public void copyAsync(DataObject srcdata, DataObject destData, AsyncCompletionCa
                 (srcdata.getType() == DataObjectType.VOLUME && destData.getType() == DataObjectType.VOLUME)) {
 
             int nMaxExecutionMinutes = NumbersUtil.parseInt(configDao.getValue(Config.SecStorageCmdExecutionTimeMax.key()), 30);
-            CopyCommand cmd = new CopyCommand(srcdata.getTO(), destData.getTO(), nMaxExecutionMinutes * 60 * 1000, true);
+            CopyCommand cmd = new CopyCommand(srcdata.getTO(), destData.getTO(), nMaxExecutionMinutes * 60 * 1000, VirtualMachineManager.ExecuteInSequence.value());
             Answer answer = null;
 
             // Select host endpoint such that the load is balanced out