Merge e1025a9095 into cd5bb09d0d

Missing char
Declare interval as non dynamic
2026-01-22 09:59:54 +00:00 · 2025-04-25 07:03:31 -03:00 · 2025-04-25 07:00:55 -03:00 · 2025-04-25 06:58:27 -03:00 · 2025-04-25 06:56:33 -03:00 · 2025-04-25 06:56:26 -03:00
1 changed files with 3 additions and 2 deletions
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@ -3560,7 +3560,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra

                final List<Long> networkIds = _networksDao.findNetworksToGarbageCollect();
                final int netGcWait = NumbersUtil.parseInt(_configDao.getValue(NetworkGcWait.key()), 60);
-                logger.info("NetworkGarbageCollector uses '{}' seconds for GC interval.", netGcWait);
+                final int netGcInterval = NumbersUtil.parseInt(_configDao.getValue(NetworkGcInterval.key()), 60);
+                logger.info("NetworkGarbageCollector uses '{}' seconds for GC wait and '{}' seconds for GC interval.", netGcWait, netGcInterval);

                for (final Long networkId : networkIds) {
                    if (!_networkModel.isNetworkReadyForGc(networkId)) {
@ -4884,7 +4885,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
    public static final ConfigKey<Integer> NetworkGcWait = new ConfigKey<Integer>(Integer.class, "network.gc.wait", "Advanced", "600",
            "Time (in seconds) to wait before shutting down a network that's not in used", false, Scope.Global, null);
    public static final ConfigKey<Integer> NetworkGcInterval = new ConfigKey<Integer>(Integer.class, "network.gc.interval", "Advanced", "600",
-            "Seconds to wait before checking for networks to shutdown", true, Scope.Global, null);
+            "Seconds to wait before checking for networks to shutdown", false, Scope.Global, null);

    @Override
    public ConfigKey<?>[] getConfigKeys() {
Author	SHA1	Message	Date
Andrija Panic	6b6e69a083	Merge `e1025a9095` into `cd5bb09d0d`	2026-01-22 09:59:54 +00:00
nvazquez	e1025a9095	Missing char	2025-04-25 07:03:31 -03:00
nvazquez	97845169e2	Declare interval as non dynamic	2025-04-25 07:00:55 -03:00
nvazquez	e0e9d641fb	Address review comments	2025-04-25 06:58:27 -03:00
Andrija Panic	9a66f939d7	Update NetworkOrchestrator.java network.gc.value was mistakenly obtained from network.gc.wait added messages for both gc.wait and gc.internval.	2025-04-25 06:56:33 -03:00
Andrija Panic	d9868cde62	Update schema-42000to42010.sql Update dynamic setting for the network.gc.intervla and the wrong message for wait period.	2025-04-25 06:56:26 -03:00