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

Open
wants to merge 5 commits into
base: 4.20
Choose a base branch
from
Open

Fix logs mismatch between Network GC wait and interval #10776

Changes from all commits
Commits
Show all changes
5 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
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
5 changes: 3 additions & 2 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 @@ -3556,7 +3556,8 @@

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);
Copy link
Member

Choose a reason for hiding this comment

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

Is the purpose to only log it, why not use the ConfigKey read the value, than use the ConfigDao?

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
final int netGcInterval = NumbersUtil.parseInt(_configDao.getValue(NetworkGcInterval.key()), 60);
final int netGcInterval = NumbersUtil.parseInt(NetworkGcInterval.value()), 60);

Copy link
Member

Choose a reason for hiding this comment

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

@andrijapanicsb ?

Copy link
Member

Choose a reason for hiding this comment

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

or even more simple:

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);

Check warning on line 3560 in engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

View check run for this annotation

Codecov / codecov/patch

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java#L3559-L3560 

Added lines #L3559 - L3560 were not covered by tests

for (final Long networkId : networkIds) {
if (!_networkModel.isNetworkReadyForGc(networkId)) {
Expand Down Expand Up @@ -4868,7 +4869,7 @@
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);
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"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

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


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