Skip to content

Move console proxy related global settings to Zone level#11415

Merged
DaanHoogland merged 8 commits intomainfrom
change-cp-settings-to-zonelevel
Sep 17, 2025
Merged

Move console proxy related global settings to Zone level#11415
DaanHoogland merged 8 commits intomainfrom
change-cp-settings-to-zonelevel

Conversation

@Pearl1594
Copy link
Copy Markdown
Contributor

@Pearl1594 Pearl1594 commented Aug 7, 2025 •
edited
Loading

Description

This PR moves console proxy related global settings to Zone level as CPVM in a zone level resource, and it makes sense to have these settings at the zone level

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

Screenshots (if appropriate):

How Has This Been Tested?

For dev-testing, I added logs in the ConsoleProxyManagerImpl::scanPool method that's called every 30sec to check the zone & global level values to identify if they are correctly set:

When no zone level values are set:

2025-08-22 14:47:54,358 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Configuration values for CPVM in zone 1: 
2025-08-22 14:47:54,359 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) SSL enabled: Zone level: false - Global level: false
2025-08-22 14:47:54,361 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) NoVNC console default: Zone level: true - Global level: true
2025-08-22 14:47:54,363 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy service offering: Zone level: null - Global level: null
2025-08-22 14:47:54,365 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy standby capacity: Zone level: 10 - Global level: 10
2025-08-22 14:47:54,366 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy capacity scan interval: Zone level: 30000 - Global level: 30000
2025-08-22 14:47:54,367 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy command port: Zone level: 8001 - Global level: 8001
2025-08-22 14:47:54,368 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy restart: Zone level: true - Global level: true
2025-08-22 14:47:54,369 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy URL domain: Zone level:  - Global level: 
2025-08-22 14:47:54,371 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy session max: Zone level: 50 - Global level: 50
2025-08-22 14:47:54,372 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy session timeout: Zone level: 300000 - Global level: 300000
2025-08-22 14:47:54,373 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy disable rp filter: Zone level: true - Global level: true
2025-08-22 14:47:54,374 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c) Console proxy launch max: Zone level: 10 - Global level: 10
2025-08-22 14:47:54,374 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-7dea5014]) (logid:6c106e9c)

After changing zone-level values:

2025-08-22 15:03:38,200 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Configuration values for CPVM in zone 1: 
2025-08-22 15:03:38,201 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) SSL enabled: Zone level: false - Global level: false
2025-08-22 15:03:38,202 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) NoVNC console default: Zone level: false - Global level: true
2025-08-22 15:03:38,203 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy service offering: Zone level: null - Global level: null
2025-08-22 15:03:38,205 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy standby capacity: Zone level: 5 - Global level: 10
2025-08-22 15:03:38,206 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy capacity scan interval: Zone level: 30000 - Global level: 30000
2025-08-22 15:03:38,207 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy command port: Zone level: 8010 - Global level: 8001
2025-08-22 15:03:38,208 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy restart: Zone level: false - Global level: true
2025-08-22 15:03:38,209 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy URL domain: Zone level: shapeblue.com - Global level: 
2025-08-22 15:03:38,209 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy session max: Zone level: 35 - Global level: 50
2025-08-22 15:03:38,210 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy session timeout: Zone level: 100000 - Global level: 300000
2025-08-22 15:03:38,211 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy disable rp filter: Zone level: false - Global level: true
2025-08-22 15:03:38,212 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d) Console proxy launch max: Zone level: 5 - Global level: 10
2025-08-22 15:03:38,212 DEBUG [c.c.c.ConsoleProxyManagerImpl] (consoleproxy-1:[ctx-56bf2911]) (logid:0c7de63d)

Testing console proxy service offering value by:

  • Changing value at zone level and deploying a CPVM without restart picks a new one
  • remove the existing default offering for cpvm such that there are no more offerings - and observe on recreation it creates a new one (as expected)

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

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 7, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 14.03509% with 98 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.36%. Comparing base (8089d32) to head (a5f557f).
⚠️ Report is 27 commits behind head on main.

Files with missing lines Patch % Lines
...om/cloud/consoleproxy/ConsoleProxyManagerImpl.java 0.00% 82 Missing ⚠️
...ain/java/com/cloud/consoleproxy/AgentHookBase.java 0.00% 7 Missing ⚠️
...ud/consoleproxy/AgentBasedConsoleProxyManager.java 0.00% 6 Missing ⚠️
...arystorage/PremiumSecondaryStorageManagerImpl.java 0.00% 2 Missing ⚠️
...udstack/consoleproxy/ConsoleAccessManagerImpl.java 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               main   #11415      +/-   ##
============================================
- Coverage     17.36%   17.36%   -0.01%     
+ Complexity    15245    15244       -1     
============================================
  Files          5888     5888              
  Lines        525831   525843      +12     
  Branches      64183    64180       -3     
============================================
- Hits          91298    91291       -7     
- Misses       424227   424245      +18     
- Partials      10306    10307       +1
Flag Coverage Δ
uitests 3.63% <ø> (ø)
unittests 18.40% <14.03%> (-0.01%) ⬇️

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.

@Pearl1594
Copy link
Copy Markdown
Contributor Author

Pearl1594 commented Aug 21, 2025

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 21, 2025

@Pearl1594 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
Copy Markdown

blueorangutan commented Aug 21, 2025

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

DaanHoogland
DaanHoogland approved these changes Aug 22, 2025
View reviewed changes
Copy link
Copy Markdown
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.

good change, some remarks though

@Pearl1594 Pearl1594 changed the title [WIP] Move console proxy related global settings to Zone level Move console proxy related global settings to Zone level Aug 22, 2025
@Pearl1594
Copy link
Copy Markdown
Contributor Author

Pearl1594 commented Aug 22, 2025

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 22, 2025

@Pearl1594 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
Copy Markdown

blueorangutan commented Aug 22, 2025

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

@DaanHoogland DaanHoogland added this to the 4.22.0 milestone Aug 25, 2025
@Pearl1594
Copy link
Copy Markdown
Contributor Author

Pearl1594 commented Aug 25, 2025

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 25, 2025

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

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 25, 2025

[SF] Trillian Build Failed (tid-14112)

@Pearl1594
Copy link
Copy Markdown
Contributor Author

Pearl1594 commented Aug 27, 2025

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 27, 2025

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

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Aug 28, 2025

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

Test Result Time (s) Test File

@RosiKyu RosiKyu self-assigned this Sep 1, 2025
@Pearl1594 Pearl1594 closed this Sep 2, 2025
@github-project-automation github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.22.0 Sep 2, 2025
@Pearl1594 Pearl1594 reopened this Sep 2, 2025
@borisstoyanov borisstoyanov moved this from Done to In Progress in Apache CloudStack 4.22.0 Sep 3, 2025
@Pearl1594 Pearl1594 requested a review from RosiKyu September 3, 2025 19:47
@kiranchavala kiranchavala mentioned this pull request Sep 4, 2025
Open
@Pearl1594
Copy link
Copy Markdown
Contributor Author

Pearl1594 commented Sep 9, 2025

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Sep 9, 2025

@Pearl1594 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
Copy Markdown

blueorangutan commented Sep 9, 2025

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

@Pearl1594
Copy link
Copy Markdown
Contributor Author

Pearl1594 commented Sep 9, 2025

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Sep 9, 2025

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

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Sep 9, 2025

Quality Gate Failed Quality Gate failed

Failed conditions
5.7% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube Cloud

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Sep 9, 2025

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

harikrishna-patnala
harikrishna-patnala approved these changes Sep 17, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@harikrishna-patnala harikrishna-patnala left a comment

Choose a reason for hiding this comment

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

code LGTM

@yadvr yadvr marked this pull request as ready for review September 17, 2025 06:20
@yadvr
Copy link
Copy Markdown
Member

yadvr commented Sep 17, 2025

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Sep 17, 2025

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

@DaanHoogland DaanHoogland merged commit e7015cb into main Sep 17, 2025
48 of 50 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Apache CloudStack 4.22.0 Sep 17, 2025
@blueorangutan
Copy link
Copy Markdown

blueorangutan commented Sep 17, 2025

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

Test Result Time (s) Test File

@DaanHoogland DaanHoogland deleted the change-cp-settings-to-zonelevel branch March 19, 2026 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvr yadvr yadvr approved these changes

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@harikrishna-patnala harikrishna-patnala harikrishna-patnala approved these changes

@RosiKyu RosiKyu Awaiting requested review from RosiKyu

Assignees

@RosiKyu RosiKyu

Labels

component:secondary-storage component:ssvm status:ready-for-merge

Projects

No open projects
Apache CloudStack 4.22.0
Status: Done

Milestone

4.22.0

Development

Successfully merging this pull request may close these issues.

7 participants

@Pearl1594 @blueorangutan @yadvr @DaanHoogland @harikrishna-patnala @borisstoyanov @RosiKyu