winterhazel commented on code in PR #12086:
URL: https://github.com/apache/cloudstack/pull/12086#discussion_r3170373731
##########
engine/components-api/src/main/java/com/cloud/storage/StorageManager.java:
##########
@@ -233,6 +233,9 @@ public interface StorageManager extends StorageService {
"while adding a new Secondary Storage. If the copy operation
fails, the system falls back to downloading the template from the source URL.",
true, ConfigKey.Scope.Zone, null);
+ ConfigKey<Integer> AgentMaxDataMigrationWaitTime = new
ConfigKey<>("Advanced", Integer.class, "agent.max.data.migration.wait.time",
"3600",
Review Comment:
It would be nice to open an issue to use this timeout instead of
`secstorage.cmd.execution.time.max` for template and volume migration as well
in the future
##########
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java:
##########
@@ -421,6 +526,28 @@ protected synchronized void tryCleaningUpExecutor(Long
zoneId) {
executor.shutdown();
}
+ protected void tryCleaningUpKvmIncrementalExecutor(Long zoneId) {
Review Comment:
We may need to synchronize this with `submitKvmIncrementalMigration` in a
logic similar to `zoneExecutorMap`/`zonePendingWorkCountMap` in order to avoid
the MS attempting to submit new tasks after an executon has been shutdown.
##########
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java:
##########
@@ -128,6 +146,7 @@ public class StorageOrchestrator extends ManagerBase
implements StorageOrchestra
private final Map<Long, ThreadPoolExecutor> zoneExecutorMap = new
HashMap<>();
private final Map<Long, Integer> zonePendingWorkCountMap = new HashMap<>();
+ private final Map<Long, ThreadPoolExecutor>
zoneKvmIncrementalResourcesExecutorMap = new ConcurrentHashMap<>();
Review Comment:
Could you rename these 3 variables in order to make it clearer that the
first 2 ones are for SSVM commands, and the last for Agent commands?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
