You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by "weizhouapache (via GitHub)" <gi...@apache.org> on 2026/05/22 09:01:36 UTC
[PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
weizhouapache opened a new pull request, #13219:
URL: https://github.com/apache/cloudstack/pull/13219
### Description
This PR refactores #11190
<!--- Describe your changes in DETAIL - And how has behaviour functionally changed. -->
<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
<!--- ******************************************************************************* -->
<!--- NOTE: AUTOMATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!--- ******************************************************************************* -->
### Types of changes
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
- [ ] Build/CI
- [ ] Test (unit or integration test code)
### Feature/Enhancement Scale or Bug Severity
#### Feature/Enhancement Scale
- [ ] Major
- [ ] Minor
#### Bug Severity
- [ ] BLOCKER
- [ ] Critical
- [ ] Major
- [ ] Minor
- [ ] Trivial
### Screenshots (if appropriate):
### How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
#### How did you try to break this feature and the system with this change?
<!-- see how your change affects other areas of the code, etc. -->
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4517527646
@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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "nagaboinaramgopal (via GitHub)" <gi...@apache.org>.
nagaboinaramgopal commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-5640149254
@weizhouapache I tried a VPC without tiers on a clean 4.22 branch setup (KVM, 4.22.0 systemvm template), without this change.
The router only gets ssh in its monitor config. The health check results show no FAILED checks and no alert is raised. `dhcp_check.py` reports UNKNOWN, which I think is intended since #10710. So I could not reproduce the webserver.service alert from #10088 on 4.22.
Also, as far as I can see, `excluded_health_checks` is only applied to the scripts in `/root/health_checks` in `monitorServices.py`. The service checks from `monitProcess()` (for example `webserver.service`) do not look at it, and the name added here is `apache2`, not `webserver.service`.
Could you share the steps to get the webserver.service failure? I will reproduce them in my lab and test this PR with and without the change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4517943389
@blueorangutan test
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4517946150
@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4517304147
## [Codecov](https://app.codecov.io/gh/apache/cloudstack/pull/13219?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) Report
:white_check_mark: All modified and coverable lines are covered by tests.
:white_check_mark: Project coverage is 3.69%. Comparing base ([`d1e1aa5`](https://app.codecov.io/gh/apache/cloudstack/commit/d1e1aa5d2035e46af01059315b98f290909969d4?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache)) to head ([`73f4929`](https://app.codecov.io/gh/apache/cloudstack/commit/73f4929711d08dcb7d6c60a5c122d99b7da3fe5c?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache)).
> :exclamation: There is a different number of reports uploaded between BASE (d1e1aa5) and HEAD (73f4929). Click for more details.
>
> <details><summary>HEAD has 1 upload less than BASE</summary>
>
>| Flag | BASE (d1e1aa5) | HEAD (73f4929) |
>|------|------|------|
>|unittests|1|0|
></details>
<details><summary>Additional details and impacted files</summary>
```diff
@@ Coverage Diff @@
## 4.22 #13219 +/- ##
=============================================
- Coverage 17.67% 3.69% -13.98%
=============================================
Files 5922 448 -5474
Lines 533127 38105 -495022
Branches 65205 7059 -58146
=============================================
- Hits 94243 1409 -92834
+ Misses 428239 36509 -391730
+ Partials 10645 187 -10458
```
| [Flag](https://app.codecov.io/gh/apache/cloudstack/pull/13219/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | Coverage Δ | |
|---|---|---|
| [uitests](https://app.codecov.io/gh/apache/cloudstack/pull/13219/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `3.69% <ø> (ø)` | |
| [unittests](https://app.codecov.io/gh/apache/cloudstack/pull/13219/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) | `?` | |
Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache#carryforward-flags-in-the-pull-request-comment) to find out more.
</details>
[:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/apache/cloudstack/pull/13219?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
:loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
<details><summary> :rocket: New features to boost your workflow: </summary>
- :snowflake: [Test Analytics](https://docs.codecov.com/docs/test-analytics): Detect flaky tests, report on failures, and find test suite problems.
- :package: [JS Bundle Analysis](https://docs.codecov.com/docs/javascript-bundle-analysis): Save yourself from yourself by tracking and limiting bundle sizes in JS merges.
</details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4523564499
<b>[SF] Trillian test result (tid-16164)</b>
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 47540 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13219-t16164-kvm-ol8.zip
Smoke tests completed. 149 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:
Test | Result | Time (s) | Test File
--- | --- | --- | ---
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#discussion_r3302434345
##########
server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java:
##########
@@ -1568,16 +1568,23 @@ private SetMonitorServiceCommand createMonitorServiceCommand(DomainRouterVO rout
command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ENABLED, RouterHealthChecksEnabled.value().toString());
command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_BASIC_INTERVAL, RouterHealthChecksBasicInterval.value().toString());
command.setAccessDetail(SetMonitorServiceCommand.ROUTER_HEALTH_CHECKS_ADVANCED_INTERVAL, RouterHealthChecksAdvancedInterval.value().toString());
+
+ final List<Long> routerGuestNtwkIds = _routerDao.getRouterNetworks(router.getId());
String excludedTests = RouterHealthChecksToExclude.valueIn(router.getDataCenterId());
if (router.getIsRedundantRouter()) {
// Disable gateway check if VPC has no tiers or no active VM's in it
- final List<Long> routerGuestNtwkIds = _routerDao.getRouterNetworks(router.getId());
if (RedundantState.BACKUP.equals(router.getRedundantState()) ||
routerGuestNtwkIds == null || routerGuestNtwkIds.isEmpty()) {
excludedTests = excludedTests.isEmpty() ? BACKUP_ROUTER_EXCLUDED_TESTS : excludedTests + "," + BACKUP_ROUTER_EXCLUDED_TESTS;
}
}
+ 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;
Review Comment:
```suggestion
if (excludedTests.isEmpty()) {
excludedTests = webserverServiceName;
} else if (! excludedTests.contains(webserverServiceName)) {
excludedTests += "," + webserverServiceName;
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4517298448
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4517523062
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-4517931702
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17985
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] server: exclude webserver/apache2 check in VPC VR without tiers [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #13219:
URL: https://github.com/apache/cloudstack/pull/13219#issuecomment-5644885339
>
> @weizhouapache I tried a VPC without tiers on a clean 4.22 branch setup (KVM, 4.22.0 systemvm template), without this change.
>
> The router only gets ssh in its monitor config. The health check results show no FAILED checks and no alert is raised. `dhcp_check.py` reports UNKNOWN, which I think is intended since #10710. So I could not reproduce the webserver.service alert from #10088 on 4.22.
>
> Also, as far as I can see, `excluded_health_checks` is only applied to the scripts in `/root/health_checks` in `monitorServices.py`. The service checks from `monitProcess()` (for example `webserver.service`) do not look at it, and the name added here is `apache2`, not `webserver.service`.
the monitor service "webserver" is actually mapped to the `apache2` service inside VR
```
*************************** 1. row ***************************
id: 4
uuid: bcb5744a-ba1a-11f0-9974-1e00b5000454
service: webserver
process_name: apache2
service_name: apache2
service_path: /etc/init.d/apache2
pidfile: /var/run/apache2/apache2.pid
isDefault: 1
1 row in set (0.00 sec)
```
>
> Could you share the steps to get the webserver.service failure? I will reproduce them in my lab and test this PR with and without the change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org