server: exclude webserver/apache2 check in VPC VR without tiers#13219
server: exclude webserver/apache2 check in VPC VR without tiers#13219weizhouapache wants to merge 1 commit into
Conversation
|
@blueorangutan package |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.22 #13219 +/- ##
============================================
- Coverage 17.67% 17.67% -0.01%
- Complexity 15791 15792 +1
============================================
Files 5922 5922
Lines 533127 533130 +3
Branches 65205 65207 +2
============================================
- Hits 94243 94242 -1
- Misses 428239 428241 +2
- Partials 10645 10647 +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:
|
|
@blueorangutan package |
|
@weizhouapache 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 17985 |
|
@blueorangutan test |
|
@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-16164)
|
| if (router.getVpcId() != null && CollectionUtils.isEmpty(routerGuestNtwkIds)) { | ||
| // If router belongs to a VPC and has no guest network associated, exclude webserver service which is expected to fail | ||
| String webserverServiceName = _monitorServiceDao.getServiceByName(MonitoringService.Service.Webserver.toString()).getServiceName(); | ||
| excludedTests = excludedTests.isEmpty() ? webserverServiceName : excludedTests + "," + webserverServiceName; |
There was a problem hiding this comment.
| excludedTests = excludedTests.isEmpty() ? webserverServiceName : excludedTests + "," + webserverServiceName; | |
| if (excludedTests.isEmpty()) { | |
| excludedTests = webserverServiceName; | |
| } else if (! excludedTests.contains(webserverServiceName)) { | |
| excludedTests += "," + webserverServiceName; | |
| } |
3 participants
Description
This PR refactores #11190
logs show
apache2service is excluded in the router health check2026-05-22 08:51:37,940 DEBUG [c.c.a.t.Request] (RouterStatusMonitor-1:[ctx-0aaf1866]) (logid:9c7a5c66) Seq 1-2002412984319607143: Sending { Cmd , MgmtId: 32985902482535, via: 1(ref-trl-10000-k-Mu24-wei-zhou-kvm1), Ver: v1, Flags: 100011, [{"com.cloud.agent.api.routing.SetMonitorServiceCommand":{"healthChecksConfig":{"gateways":"gatewaysIps=169.254.0.1 10.0.48.1 ","portForwarding":"","systemThresholds":"minDiskNeeded=100.0,maxCpuUsage=100.0,maxMemoryUsage=100.0;","haproxyData":"","virtualMachines":"","routerVersion":"templateVersion=Cloudstack Release 4.22.0 Fri Oct 3 08:20:09 AM UTC 2025,scriptsVersion=8c8bf4fd7c7c39084206d0a9b1c27612d41bc019d98b722aa7bacfc4245c01e6191a9c8c98457e2740f072139ee9bbab3ee8c59e5e59701617c296807c96ab10"},"reconfigureAfterUpdate":"true","deleteFromProcessedCache":"true","accessDetails":{"router.name":"r-610-VM","router.health.checks.advanced.interval":"10","router.health.checks.enabled":"true","router.health.checks.basic.interval":"3","router.health.checks.excluded":"apache2","router.ip":"169.254.222.103"},"wait":"0","bypassHostMaintenance":"false"}}] }Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?