ssvm: use mgmt network if no storage network by shwstppr · Pull Request #10735 · apache/cloudstack

shwstppr · 2025-04-16T09:55:34Z

Description

Fixes #10163

Based on #10163 (comment)

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 · 2025-04-16T10:04:05Z

Codecov Report

❌ Patch coverage is 76.92308% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.17%. Comparing base (db5b6a5) to head (1b02b91).
⚠️ Report is 20 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
.../storage/resource/NfsSecondaryStorageResource.java	76.92%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #10735   +/-   ##
=========================================
  Coverage     16.17%   16.17%           
- Complexity    13286    13299   +13     
=========================================
  Files          5656     5656           
  Lines        498015   498091   +76     
  Branches      60406    60416   +10     
=========================================
+ Hits          80538    80589   +51     
- Misses       408515   408536   +21     
- Partials       8962     8966    +4

Flag	Coverage Δ
uitests	`4.00% <ø> (-0.01%)`	⬇️
unittests	`17.03% <76.92%> (+<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.

shwstppr · 2025-04-16T10:22:06Z

@blueorangutan package

blueorangutan · 2025-04-16T10:24:04Z

@shwstppr 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 · 2025-04-16T11:54:33Z

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

...server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java

weizhouapache · 2025-09-04T09:49:24Z

@shwstppr
I would like to re-open and test this PR against 4.20
what do you think ?

Fixes apache#10163 Based on apache#10163 (comment) Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

github-actions · 2025-09-04T10:53:09Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

shwstppr · 2025-09-04T10:53:59Z

@weizhouapache I've re-opened and rebased it for 4.20

@blueorangutan package

blueorangutan · 2025-09-04T10:56:04Z

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

weizhouapache · 2025-09-04T11:21:50Z

@weizhouapache I've re-opened and rebased it for 4.20
thanks @shwstppr , I will test it

blueorangutan · 2025-09-04T13:12:04Z

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

blueorangutan · 2025-09-05T08:33:26Z

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

Test	Result	Time (s)	Test File
test_DeleteDomain	`Error`	364.93	test_accounts.py
test_forceDeleteDomain	`Failure`	104.64	test_accounts.py
ContextSuite context=TestRemoteDiagnostics>:setup	`Error`	0.00	test_diagnostics.py
test_list_vms_metrics_admin	`Error`	3610.25	test_metrics_api.py
test_list_vms_metrics_history	`Error`	6.53	test_metrics_api.py
test_list_volumes_metrics_history	`Error`	4.46	test_metrics_api.py

weizhouapache · 2025-09-08T11:35:39Z

@shwstppr
the issue #10163 is present in my testing

it looks like we need to set the storage netmask and gateway too

diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 454b98d0f6e..4eb45f2b5b9 100644
--- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -2744,8 +2744,8 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
         if (_storageIp == null && _inSystemVM) {
             logger.warn("There is no storageip in /proc/cmdline, something wrong!");
         }
-        _storageNetmask = (String)params.get("storagenetmask");
-        _storageGateway = (String)params.get("storagegateway");
+        _storageNetmask = MapUtils.getString(params, "storagenetmask", _eth1mask);
+        _storageGateway = MapUtils.getString(params, "storagegateway", (String)params.get("localgw"));
         super.configure(name, params);
 
         _params = params;

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · 2025-09-08T16:02:36Z

@weizhouapache thanks for the tests. I've made some changes

@blueorangutan package

blueorangutan · 2025-09-08T16:04:04Z

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

...server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java

blueorangutan · 2025-09-08T17:24:30Z

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

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · 2025-09-08T19:22:15Z

@blueorangutan package

blueorangutan · 2025-09-08T19:24:04Z

@shwstppr 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 · 2025-09-08T20:35:59Z

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

weizhouapache · 2025-09-08T21:23:30Z

@blueorangutan test

blueorangutan · 2025-09-08T21:24:03Z

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

blueorangutan · 2025-09-08T22:15:25Z

[SF] Trillian Build Failed (tid-14248)

weizhouapache · 2025-09-09T11:14:17Z

@blueorangutan test

blueorangutan · 2025-09-09T11:16:03Z

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

blueorangutan · 2025-09-10T02:08:57Z

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

Test	Result	Time (s)	Test File
test_04_extract_template	`Failure`	133.10	test_templates.py
test_06_download_detached_volume	`Failure`	436.77	test_volumes.py

blueorangutan · 2025-09-10T06:07:49Z

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

Test	Result	Time (s)	Test File

weizhouapache · 2025-09-10T07:44:37Z

Verified OK

root@s-15-VM:~# grep 'Storage network not configured' /var/log/cloud.log 
2025-09-10T07:40:53,726 INFO  [storage.resource.NfsSecondaryStorageResource] (main:[]) Storage network not configured, using management network[ip: 10.0.42.34, netmask: 255.255.240.0, gateway: 10.0.32.1] for storage traffic

root@s-15-VM:~# grep 'ip route add' /var/log/cloud.log 
root@s-15-VM:~#

harikrishna-patnala

code LGTM

weizhouapache · 2025-09-11T08:53:48Z

Merging based on approvals and manual test results

* ssvm: use mgmt network if no storage network Fixes apache#10163 Based on apache#10163 (comment) Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> * update Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> * fix Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> --------- Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

boring-cyborg bot added component:secondary-storage component:ssvm labels Apr 16, 2025

shwstppr mentioned this pull request Apr 16, 2025

SSVM System VM fails to add static route to NFS server (ip route add x.x.x.x via null) #10163

Closed

shwstppr linked an issue Apr 16, 2025 that may be closed by this pull request

SSVM System VM fails to add static route to NFS server (ip route add x.x.x.x via null) #10163

Closed

shwstppr mentioned this pull request Apr 16, 2025

Fix nfs route bug #10304

Closed

weizhouapache reviewed Apr 16, 2025

View reviewed changes

...server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java Outdated Show resolved Hide resolved

shwstppr closed this May 16, 2025

shwstppr reopened this Sep 4, 2025

ssvm: use mgmt network if no storage network

f629b62

Fixes apache#10163 Based on apache#10163 (comment) Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr force-pushed the fix-nfs-static-route branch from 3337b5f to f629b62 Compare September 4, 2025 10:52

boring-cyborg bot added component:agent component:build component:integration labels Sep 4, 2025

github-actions bot added the status:has-conflicts label Sep 4, 2025

shwstppr changed the base branch from 4.19 to 4.20 September 4, 2025 10:53

shwstppr removed component:secondary-storage status:has-conflicts component:agent component:build component:integration labels Sep 4, 2025

weizhouapache self-assigned this Sep 4, 2025

shwstppr marked this pull request as ready for review September 7, 2025 05:16

update

839e73e

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

boring-cyborg bot added the component:secondary-storage label Sep 8, 2025

weizhouapache reviewed Sep 8, 2025

View reviewed changes

...server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java Outdated Show resolved Hide resolved

fix

1b02b91

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

weizhouapache approved these changes Sep 10, 2025

View reviewed changes

weizhouapache requested review from harikrishna-patnala and vishesh92 September 10, 2025 12:02

harikrishna-patnala approved these changes Sep 11, 2025

View reviewed changes

weizhouapache merged commit 38006b2 into apache:4.20 Sep 11, 2025
26 checks passed

DaanHoogland deleted the fix-nfs-static-route branch September 15, 2025 07:16

Conversation

shwstppr commented Apr 16, 2025

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 Apr 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

shwstppr commented Apr 16, 2025

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

Uh oh!

weizhouapache commented Sep 4, 2025

Uh oh!

github-actions bot commented Sep 4, 2025

Uh oh!

shwstppr commented Sep 4, 2025

Uh oh!

blueorangutan commented Sep 4, 2025

Uh oh!

weizhouapache commented Sep 4, 2025

Uh oh!

blueorangutan commented Sep 4, 2025

Uh oh!

blueorangutan commented Sep 5, 2025

Uh oh!

weizhouapache commented Sep 8, 2025

Uh oh!

shwstppr commented Sep 8, 2025

Uh oh!

blueorangutan commented Sep 8, 2025

Uh oh!

Uh oh!

blueorangutan commented Sep 8, 2025

Uh oh!

shwstppr commented Sep 8, 2025

Uh oh!

blueorangutan commented Sep 8, 2025

Uh oh!

blueorangutan commented Sep 8, 2025

Uh oh!

weizhouapache commented Sep 8, 2025

Uh oh!

blueorangutan commented Sep 8, 2025

Uh oh!

blueorangutan commented Sep 8, 2025

Uh oh!

weizhouapache commented Sep 9, 2025

Uh oh!

blueorangutan commented Sep 9, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

weizhouapache commented Sep 10, 2025

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Sep 11, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

codecov bot commented Apr 16, 2025 •

edited

Loading