From e4a504b08484d19fe41ab45e592d73b59e602587 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 1 Dec 2020 14:00:35 +0530 Subject: [PATCH] Make global setting non-dynamic (#4505) Co-authored-by: Pearl Dsilva --- .../src/main/java/com/cloud/storage/StorageManager.java | 2 +- .../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 0e245920af3..7455f22a5ad 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 SecStorageMaxMigrateSessions = new ConfigKey("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 MaxDataMigrationWaitTime = new ConfigKey("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 8eab4b24f69..9cf73e6f2a5 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