[cloudstack] branch master updated: Make global setting non-dynamic (#4505)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new e4a504b  Make global setting non-dynamic (#4505)
e4a504b is described below

commit e4a504b08484d19fe41ab45e592d73b59e602587
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Tue Dec 1 14:00:35 2020 +0530

    Make global setting non-dynamic (#4505)
    
    Co-authored-by: Pearl Dsilva <pearl.dsi...@shapeblue.com>
---
 .../components-api/src/main/java/com/cloud/storage/StorageManager.java | 2 +-
 .../org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java 
b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java
index 0e24592..7455f22 100644
--- a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java
+++ b/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);
diff --git 
a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
 
b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
index 8eab4b2..9cf73e6 100644
--- 
a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
+++ 
b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java
@@ -88,6 +88,7 @@ import com.cloud.utils.NumbersUtil;
 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 abstract class BaseImageStoreDriverImpl implements 
ImageStoreDriver {
                 (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