VR: fix haproxy check when ssl offloading is configured by weizhouapache · Pull Request #12596 · apache/cloudstack

weizhouapache · 2026-02-05T12:14:38Z

Description

This PR fixes #12591

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

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

codecov · 2026-02-05T12:25:22Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.67%. Comparing base (7aa0558) to head (12ff7a3).
⚠️ Report is 140 commits behind head on 4.22.

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #12596      +/-   ##
============================================
+ Coverage     17.61%   17.67%   +0.06%     
- Complexity    15664    15791     +127     
============================================
  Files          5917     5922       +5     
  Lines        531402   533123    +1721     
  Branches      64971    65201     +230     
============================================
+ Hits          93596    94256     +660     
- Misses       427252   428221     +969     
- Partials      10554    10646      +92

Flag	Coverage Δ
uitests	`3.69% <ø> (-0.01%)`	⬇️
unittests	`18.75% <ø> (+0.07%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

DaanHoogland · 2026-02-05T14:03:13Z

@blueorangutan package

blueorangutan · 2026-02-05T14:04:04Z

@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.

blueorangutan · 2026-02-05T15:09:04Z

Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 16713

weizhouapache · 2026-02-05T15:20:56Z

@blueorangutan package

blueorangutan · 2026-02-05T15:30:04Z

@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.

blueorangutan · 2026-02-05T16:39:26Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16715

weizhouapache · 2026-02-05T18:40:38Z

@blueorangutan test

blueorangutan · 2026-02-05T18:44:03Z

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-02-06T18:24:45Z

[SF] Trillian test result (tid-15403)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 53144 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12596-t15403-kvm-ol8.zip
Smoke tests completed. 146 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestListIdsParams>:teardown	`Error`	1.17	test_list_ids_parameter.py
test_01_snapshot_root_disk	`Error`	4.01	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	46.94	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	46.94	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:teardown	`Error`	27.66	test_snapshots.py
test_01_snapshot_usage	`Error`	48.28	test_usage.py
test_01_vpn_usage	`Error`	1.10	test_usage.py

Copilot

Pull request overview

This PR addresses issue #12591 by adjusting the SystemVM HAProxy advanced health check to tolerate additional bind options appended when SSL offloading is configured, avoiding false health check failures while keeping HAProxy config validation intact.

Changes:

Relax bind line matching in haproxy_check.py to accept bind <ip:port> ... (with trailing options) rather than requiring an exact string match.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

weizhouapache · 2026-02-08T14:52:18Z

@blueorangutan package

blueorangutan · 2026-02-08T14:54:04Z

@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.

blueorangutan · 2026-02-08T15:48:45Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16738

weizhouapache · 2026-02-08T15:57:27Z

@blueorangutan test

blueorangutan · 2026-02-08T15:58:03Z

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

blueorangutan · 2026-02-09T07:13:49Z

[SF] Trillian test result (tid-15413)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 51769 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12596-t15413-kvm-ol8.zip
Smoke tests completed. 146 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestListIdsParams>:teardown	`Error`	1.13	test_list_ids_parameter.py
test_01_snapshot_root_disk	`Error`	4.93	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	46.61	test_snapshots.py
test_02_list_snapshots_with_removed_data_store	`Error`	46.61	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:teardown	`Error`	27.57	test_snapshots.py
test_01_snapshot_usage	`Error`	20.58	test_usage.py
test_01_vpn_usage	`Error`	1.08	test_usage.py

weizhouapache · 2026-02-19T13:57:14Z

@blueorangutan package

blueorangutan · 2026-02-19T13:58:04Z

@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.

blueorangutan · 2026-02-19T15:20:54Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16884

weizhouapache · 2026-03-10T10:56:35Z

@DaanHoogland @sureshanaparti
can you please review ?

cc @borisstoyanov

weizhouapache · 2026-03-10T10:56:48Z

@blueorangutan package

blueorangutan · 2026-03-10T10:58:04Z

@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.

blueorangutan · 2026-03-10T11:55:40Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17073

DaanHoogland

still looks good

rajujith · 2026-04-10T07:38:04Z

@weizhouapache I see this error on healthcheck

Co-authored-by: Wei Zhou <weizhou@apache.org>

weizhouapache · 2026-05-11T09:55:33Z

@blueorangutan package

blueorangutan · 2026-05-11T09:56:04Z

@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.

blueorangutan · 2026-05-11T10:54:47Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17811

VR: fix haproxy check when ssl offloading is configured

fc1cc74

boring-cyborg Bot added component:virtual-router Python Warning... Python code Ahead! labels Feb 5, 2026

DaanHoogland added this to the 4.22.1 milestone Feb 5, 2026

DaanHoogland approved these changes Feb 5, 2026

View reviewed changes

weizhouapache requested a review from Copilot February 7, 2026 20:55

Copilot started reviewing on behalf of weizhouapache February 7, 2026 20:55 View session

Copilot AI reviewed Feb 7, 2026

View reviewed changes

Comment thread systemvm/debian/root/health_checks/haproxy_check.py Outdated

Update systemvm/debian/root/health_checks/haproxy_check.py

9a312bd

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

rajujith added this to Apache CloudStack 4.22.1 Feb 13, 2026

rajujith moved this to In Progress in Apache CloudStack 4.22.1 Feb 13, 2026

weizhouapache marked this pull request as ready for review February 19, 2026 13:57

Merge branch '4.22' into 4.22-vr-fix-haproxy-check-with-ssl-offloading

b97a2c9

DaanHoogland linked an issue Mar 5, 2026 that may be closed by this pull request

haproxy_check.py does not validate SSL config correctly #12591

Open

Merge branch '4.22' into 4.22-vr-fix-haproxy-check-with-ssl-offloading

9e02a1a

DaanHoogland approved these changes Mar 10, 2026

View reviewed changes

weizhouapache added status:needs-testing ready-for-testing labels Mar 11, 2026

rajujith self-requested a review April 10, 2026 04:31

sureshanaparti added the status:waiting-for-author label Apr 10, 2026

sureshanaparti removed this from Apache CloudStack 4.22.1 Apr 24, 2026

sureshanaparti modified the milestones: 4.22.1, 4.22.2 Apr 24, 2026

weizhouapache commented May 11, 2026

View reviewed changes

Comment thread systemvm/debian/root/health_checks/haproxy_check.py Outdated

Comment thread systemvm/debian/root/health_checks/haproxy_check.py Outdated

Apply suggestions from code review

12ff7a3

Co-authored-by: Wei Zhou <weizhou@apache.org>

Conversation

weizhouapache commented Feb 5, 2026

Description

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?

Uh oh!

codecov Bot commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DaanHoogland commented Feb 5, 2026

Uh oh!

blueorangutan commented Feb 5, 2026

Uh oh!

blueorangutan commented Feb 5, 2026

Uh oh!

weizhouapache commented Feb 5, 2026

Uh oh!

blueorangutan commented Feb 5, 2026

Uh oh!

blueorangutan commented Feb 5, 2026

Uh oh!

weizhouapache commented Feb 5, 2026

Uh oh!

blueorangutan commented Feb 5, 2026

Uh oh!

blueorangutan commented Feb 6, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

weizhouapache commented Feb 8, 2026

Uh oh!

blueorangutan commented Feb 8, 2026

Uh oh!

blueorangutan commented Feb 8, 2026

Uh oh!

weizhouapache commented Feb 8, 2026

Uh oh!

blueorangutan commented Feb 8, 2026

Uh oh!

blueorangutan commented Feb 9, 2026

Uh oh!

weizhouapache commented Feb 19, 2026

Uh oh!

blueorangutan commented Feb 19, 2026

Uh oh!

blueorangutan commented Feb 19, 2026

Uh oh!

weizhouapache commented Mar 10, 2026

Uh oh!

weizhouapache commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

blueorangutan commented Mar 10, 2026

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

rajujith commented Apr 10, 2026

Uh oh!

Uh oh!

Uh oh!

weizhouapache commented May 11, 2026

Uh oh!

blueorangutan commented May 11, 2026

Uh oh!

blueorangutan commented May 11, 2026

Uh oh!

Reviewers

Assignees

Labels

codecov Bot commented Feb 5, 2026 •

edited

Loading