Skip to content

Commit 2205c4f

Browse files
author
Pearl Dsilva
committed
Make global setting non-dynamic
1 parent 4fb69e6 commit 2205c4f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public interface StorageManager extends StorageService {
113113
"In second, timeout for download template to primary storage", false);
114114

115115
ConfigKey<Integer> SecStorageMaxMigrateSessions = new ConfigKey<Integer>("Advanced", Integer.class, "secstorage.max.migrate.sessions", "2",
116-
"The max number of concurrent copy command execution sessions that an SSVM can handle", true, ConfigKey.Scope.Global);
116+
"The max number of concurrent copy command execution sessions that an SSVM can handle", false, ConfigKey.Scope.Global);
117117

118118
ConfigKey<Integer> MaxDataMigrationWaitTime = new ConfigKey<Integer>("Advanced", Integer.class, "max.data.migration.wait.time", "15",
119119
"Maximum wait time for a data migration task before spawning a new SSVM", false, ConfigKey.Scope.Global);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
import com.cloud.utils.db.TransactionLegacy;
8989
import com.cloud.utils.exception.CloudRuntimeException;
9090
import com.cloud.utils.net.Proxy;
91+
import com.cloud.vm.VirtualMachineManager;
9192
import com.cloud.vm.dao.SecondaryStorageVmDao;
9293

9394
public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver {
@@ -344,7 +345,7 @@ public void copyAsync(DataObject srcdata, DataObject destData, AsyncCompletionCa
344345
(srcdata.getType() == DataObjectType.VOLUME && destData.getType() == DataObjectType.VOLUME)) {
345346

346347
int nMaxExecutionMinutes = NumbersUtil.parseInt(configDao.getValue(Config.SecStorageCmdExecutionTimeMax.key()), 30);
347-
CopyCommand cmd = new CopyCommand(srcdata.getTO(), destData.getTO(), nMaxExecutionMinutes * 60 * 1000, true);
348+
CopyCommand cmd = new CopyCommand(srcdata.getTO(), destData.getTO(), nMaxExecutionMinutes * 60 * 1000, VirtualMachineManager.ExecuteInSequence.value());
348349
Answer answer = null;
349350

350351
// Select host endpoint such that the load is balanced out

0 commit comments

Comments
 (0)