Skip to content

Fix logs mismatch between Network GC wait and interval #10776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 8 commits into from
Jan 29, 2026
Merged

Fix logs mismatch between Network GC wait and interval #10776

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9868cd
Update schema-42000to42010.sql
andrijapanicsb Apr 24, 2025
9a66f93
Update NetworkOrchestrator.java
andrijapanicsb Apr 24, 2025
e0e9d64
Address review comments
nvazquez Apr 25, 2025
9784516
Declare interval as non dynamic
nvazquez Apr 25, 2025
e1025a9
Missing char
nvazquez Apr 25, 2025
90468ae
Update engine/orchestration/src/main/java/org/apache/cloudstack/engin…
DaanHoogland Jan 28, 2026
8b469f1
Apply suggestions from code review
DaanHoogland Jan 28, 2026
ca8bb8e
Merge branch '4.20' into network-gc-wait-dynamic
DaanHoogland Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...tration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3559,8 +3559,9 @@ public void reallyRun() {
final HashMap<Long, Long> stillFree = new HashMap<Long, Long>();

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 netGcWait = NetworkGcWait.value();
final int netGcInterval = NetworkGcInterval.value();
logger.info("NetworkGarbageCollector uses '{}' seconds for GC wait and '{}' seconds for GC interval.", netGcWait, netGcInterval);

for (final Long networkId : networkIds) {
if (!_networkModel.isNetworkReadyForGc(networkId)) {
Expand Down Expand Up @@ -4882,9 +4883,9 @@ public String getConfigComponentName() {
}

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);
"Time (in seconds) to wait before shutting down a network that's not in used", true, 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);
Copy link
Member

@weizhouapache weizhouapache May 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good 👍

btw: NetworkGcWait can be changed to Dynamic

Copy link
Contributor Author

@andrijapanicsb andrijapanicsb Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true :)


@Override
public ConfigKey<?>[] getConfigKeys() {
Expand Down
Loading