-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
base: 4.20
Are you sure you want to change the base?
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.20 #10776 +/- ##
=========================================
Coverage 16.26% 16.26%
- Complexity 13420 13422 +2
=========================================
Files 5658 5658
Lines 499496 499497 +1
Branches 60626 60626
=========================================
+ Hits 81234 81250 +16
+ Misses 409214 409197 -17
- Partials 9048 9050 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql
Outdated
Show resolved
Hide resolved
| 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.", netGcWait); | ||
| logger.info("NetworkGarbageCollector uses '{}' seconds for GC interval.", netGcInterval); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps these 2 lines can be unified into a single one: NetworkGarbageCollector uses '{}' seconds for GC wait and '{}' seconds for GC interval.
engine/schema/src/main/resources/META-INF/db/schema-42000to42010.sql
Outdated
Show resolved
Hide resolved
Update dynamic setting for the network.gc.intervla and the wrong message for wait period.
network.gc.value was mistakenly obtained from network.gc.wait added messages for both gc.wait and gc.internval.
ee5c057 to
e0e9d64
Compare
|
@blueorangutan package |
sureshanaparti
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clgtm
|
...hestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
Outdated
Show resolved
Hide resolved
...hestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
Outdated
Show resolved
Hide resolved
| "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); |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
true :)
...hestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
Outdated
Show resolved
Hide resolved
|
@andrijapanicsb Since this is for the 4.22.1 release, could you retarget the PR to the 4.22 branch? |
…e/orchestration/NetworkOrchestrator.java Co-authored-by: Wei Zhou <weizhou@apache.org>
...hestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
Outdated
Show resolved
Hide resolved
|
@blueorangutan package |
|
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16582 |
|
@blueorangutan test |
|
@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
|
[SF] Trillian test result (tid-15320)
|





Logs:
2025-04-24 19:04:20,912 INFO [o.a.c.e.o.NetworkOrchestrator] (Network-Scavenger-1:ctx-34a60b9f) (logid:ab827a5e) NetworkGarbageCollector uses '121' seconds for GC interval.
^C
Actual values (with mgmt server restart done after the value changes):