X Tutup
Skip to content

VR: fix haproxy check when ssl offloading is configured#12596

Open
weizhouapache wants to merge 4 commits intoapache:4.22from
weizhouapache:4.22-vr-fix-haproxy-check-with-ssl-offloading
Open

VR: fix haproxy check when ssl offloading is configured#12596
weizhouapache wants to merge 4 commits intoapache:4.22from
weizhouapache:4.22-vr-fix-haproxy-check-with-ssl-offloading

Conversation

@weizhouapache
Copy link
Member

@weizhouapache weizhouapache commented Feb 5, 2026

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

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

@boring-cyborg boring-cyborg bot added component:virtual-router Python Warning... Python code Ahead! labels Feb 5, 2026
@codecov
Copy link

codecov bot commented Feb 5, 2026 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.61%. Comparing base (7aa0558) to head (9e02a1a).

Additional details and impacted files 
@@            Coverage Diff            @@
##               4.22   #12596   +/-   ##
=========================================
  Coverage     17.61%   17.61%           
  Complexity    15664    15664           
=========================================
  Files          5917     5917           
  Lines        531402   531402           
  Branches      64971    64971           
=========================================
  Hits          93596    93596           
  Misses       427252   427252           
  Partials      10554    10554
Flag Coverage Δ
uitests 3.70% <ø> (ø)
unittests 18.68% <ø> (ø)

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 DaanHoogland added this to the 4.22.1 milestone Feb 5, 2026
@DaanHoogland
Copy link
Contributor

DaanHoogland commented Feb 5, 2026

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Feb 5, 2026

@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
Copy link

blueorangutan commented Feb 5, 2026

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

@weizhouapache
Copy link
Member Author

weizhouapache commented Feb 5, 2026

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Feb 5, 2026

@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
Copy link

blueorangutan commented Feb 5, 2026

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

@weizhouapache
Copy link
Member Author

weizhouapache commented Feb 5, 2026

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Feb 5, 2026

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

@blueorangutan
Copy link

blueorangutan commented Feb 6, 2026

[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

@weizhouapache weizhouapache requested a review from Copilot February 7, 2026 20:55
Copilot AI reviewed Feb 7, 2026
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

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.

@weizhouapache
Update systemvm/debian/root/health_checks/haproxy_check.py
9a312bd 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@weizhouapache
Copy link
Member Author

weizhouapache commented Feb 8, 2026

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Feb 8, 2026

@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
Copy link

blueorangutan commented Feb 8, 2026

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

@weizhouapache
Copy link
Member Author

weizhouapache commented Feb 8, 2026

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Feb 8, 2026

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

@blueorangutan
Copy link

blueorangutan commented Feb 9, 2026

[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

@rajujith rajujith moved this to In Progress in Apache CloudStack 4.22.1 Feb 13, 2026
@weizhouapache weizhouapache marked this pull request as ready for review February 19, 2026 13:57
@weizhouapache
Copy link
Member Author

weizhouapache commented Feb 19, 2026

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Feb 19, 2026

@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
Copy link

blueorangutan commented Feb 19, 2026

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

@DaanHoogland 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
@weizhouapache
Copy link
Member Author

weizhouapache commented Mar 10, 2026

@DaanHoogland @sureshanaparti
can you please review ?

cc @borisstoyanov

@weizhouapache
Copy link
Member Author

weizhouapache commented Mar 10, 2026

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Mar 10, 2026

@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
Copy link

blueorangutan commented Mar 10, 2026

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

DaanHoogland
DaanHoogland approved these changes Mar 10, 2026
View reviewed changes
Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

still looks good

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@DaanHoogland DaanHoogland DaanHoogland approved these changes

Assignees

No one assigned

Labels

component:virtual-router Python Warning... Python code Ahead!

Projects

Apache CloudStack 4.22.1
Status: In Progress

Milestone

4.22.1

Development

Successfully merging this pull request may close these issues.

haproxy_check.py does not validate SSL config correctly

4 participants

@weizhouapache @DaanHoogland @blueorangutan
X Tutup