SharedFS: fix NPE when accessing systemvm templates for unsupported hypervisors by abh1sar · Pull Request #13930 · apache/cloudstack · GitHub

Description

This PR fixes #13837

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?

… in deploySharedFSVM()

Pull request overview

This PR addresses an intermittent NullPointerException during SharedFS VM deployment by ensuring unsupported hypervisors (or hypervisors without a downloaded SystemVM template) don’t cause template dereferences, and by tightening the hypervisor list used for SystemVM-based deployments.

Changes:

Treat the getSupportedHypervisorTypes boolean flag as “for SystemVM” and use it from the SharedFS deployment path.
Fix SharedFS deployment to continue iterating hypervisors when a SystemVM template is missing, instead of dereferencing a null template.
Update the SharedFS unit test stubbing and related method signatures to match the new boolean flag name.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java	Updates mock method signature to match the renamed boolean parameter.
server/src/main/java/com/cloud/resource/ResourceManagerImpl.java	Renames the boolean parameter and keeps filtering logic for SystemVM-oriented hypervisor selection.
plugins/storage/sharedfs/storagevm/src/test/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycleTest.java	Updates stubs to call getSupportedHypervisorTypes(..., true, ...) for SharedFS deployment tests.
plugins/storage/sharedfs/storagevm/src/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java	Uses SystemVM-filtered hypervisors and prevents NPE by continuing when templates are missing.
api/src/main/java/com/cloud/resource/ResourceService.java	Renames the boolean parameter in the API interface to reflect SystemVM intent.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

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

Codecov Report

❌ Patch coverage is 50.00000% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.92%. Comparing base (a9b2f33) to head (52210d1).
⚠️ Report is 21 commits behind head on 4.22.

Files with missing lines	Patch %	Lines
...n/java/com/cloud/resource/ResourceManagerImpl.java	0.00%	2 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #13930      +/-   ##
============================================
+ Coverage     17.86%   17.92%   +0.06%     
- Complexity    16037    16113      +76     
============================================
  Files          5928     5928              
  Lines        534479   534964     +485     
  Branches      65410    65463      +53     
============================================
+ Hits          95468    95876     +408     
- Misses       428173   428180       +7     
- Partials      10838    10908      +70

Flag	Coverage Δ
uitests	4.02% <ø> (ø)
unittests	18.99% <50.00%> (+0.06%)	⬆️

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

☔ View full report in Codecov by Harness.
📢 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.

…dFSVM()

@blueorangutan package

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

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

@GaOrtiga , did you happen to test?

No @DaanHoogland , only code review.

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

ping @abh1sar

Although the main issue was already fixed by #13830, this PR offers a more complete fix.

@blueorangutan package

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

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

@blueorangutan package

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

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

LGTM

Tested on a zone with an External (Proxmox) cluster next to KVM and VMware, which is the setup from #13837. SystemVM templates were present for KVM and VMware only and none for External, so the conditions for the NPE were in place.

Created Shared FileSystems repeatedly, 12 in total, since the original failure was intermittent and depended on where External landed in the shuffled list. No NPE on any of them and nothing in the management server log. Every deploy that had capacity landed on KVM and never on External.

The only failures I saw were InsufficientServerCapacityException, from the VMware hosts in this zone being down and from my own testing filling the environment up. Neither is related to this change.

Great work @abh1sar !

* origin/main: (156 commits) Upgrade Netris SDK version to 1.1.0 since 24.0 (apache#14365) feature: instance boot group and readiness rules (apache#13907) dont show unathorized notification for prelogin (apache#14054) .github: Upgrade docker/login-action to fix ASF Allowlist failure (apache#14276) virtual router: Add route-maps to BGP peers for Routed Mode (apache#9964) Add pre-commit hook to validate dependabot.yml (apache#14107) Add the ASF Allowlist check workflow (apache#14113) Revert "VMware to KVM: cold (VDDK) and warm (CBT) migration into Ceph/RBD and Linstor, plus importVm adoption of existing RBD root volumes and Linstor root/data volumes (apache#13656)" VMware to KVM: cold (VDDK) and warm (CBT) migration into Ceph/RBD and Linstor, plus importVm adoption of existing RBD root volumes and Linstor root/data volumes (apache#13656) engine-schema: upgrade path for 24.0.0 (apache#14033) xenserver/xcpng: do not bypass secondary storage when copy volumes between pools (apache#13750) backport: Incremental NAS backup support for KVM (apache#13074) (apache#13877) storage: KVM - enable RBD/Ceph volume encryption support (apache#13556) backup: remove the powered-off precondition for all backup providers (apache#14094) Nas backup: Fix mount/unmount error handling and timeout in LibvirtRestoreBackupCommandWrapper (apache#14006) kvm: apply rbd_default_data_pool when creating volumes from templates on RBD (apache#13361) server: copy template details to vm instance details when import VM (apache#12793) marvin: use pycryptodome instead of PyCrypt (apache#13594) Packaging: accept normalized Marvin archive names (apache#13793) SharedFS: fix NPE when accessing systemvm templates for unsupported hypervisors (apache#13930) ...

fix NPE when accessing systemvm templates for unsupported hypervisors…

5fb68f8

… in deploySharedFSVM()

abh1sar requested a lite review from Copilot August 20, 2026 10:58

boring-cyborg Bot added component:api component:storage labels Aug 20, 2026

Copilot started reviewing on behalf of abh1sar August 20, 2026 10:58

View session

Copilot AI reviewed Aug 20, 2026

View reviewed changes

Comment thread ...c/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java Resolved

Comment thread ...c/main/java/org/apache/cloudstack/storage/sharedfs/lifecycle/StorageVmSharedFSLifeCycle.java Resolved

systemvm -> SystemVM

099e74a

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

Add unit test for skip-hypervisor-without-template fix in deployShare…

ac688c7

…dFSVM()

vladimirpetrov added this to the 4.22.2 milestone Aug 20, 2026

DaanHoogland added this to CloudStack Testing Aug 21, 2026

github-project-automation Bot moved this to Backlog in CloudStack Testing Aug 21, 2026

GaOrtiga approved these changes Aug 24, 2026

View reviewed changes

DaanHoogland linked an issue Aug 25, 2026 that may be closed by this pull request

Shared FileSystem deploy fails with NPE #13837

Closed

DaanHoogland added the status:needs-testing label Aug 26, 2026

DaanHoogland moved this from Backlog to Ready in CloudStack Testing Aug 31, 2026

github-actions Bot added the status:has-conflicts label Sep 8, 2026

DaanHoogland moved this from Ready to conflict/waiting in CloudStack Testing Sep 8, 2026

Merge branch '4.22' into sharedfs-template-npe

3e79c70

github-actions Bot removed the status:has-conflicts label Sep 9, 2026

sharedfs: drop duplicate skip-hypervisor test after 4.22 merge

52210d1

abh1sar force-pushed the sharedfs-template-npe branch from b343252 to 52210d1 Compare September 9, 2026 14:45

RosiKyu approved these changes Sep 11, 2026

View reviewed changes

RosiKyu merged commit 9030443 into apache:4.22 Sep 11, 2026
26 checks passed

github-project-automation Bot moved this from conflict/waiting to Done in CloudStack Testing Sep 11, 2026

RosiKyu mentioned this pull request Sep 11, 2026

Shared FileSystem deploy fails with NPE #13837

Closed

abh1sar deleted the sharedfs-template-npe branch September 14, 2026 04:14

SharedFS: fix NPE when accessing systemvm templates for unsupported hypervisors by abh1sar · Pull Request #13930 · apache/cloudstack · GitHub

Repository navigation

SharedFS: fix NPE when accessing systemvm templates for unsupported hypervisors - #13930

SharedFS: fix NPE when accessing systemvm templates for unsupported hypervisors#13930RosiKyu merged 5 commits intoapache:4.22apache/cloudstack:4.22from shapeblue:sharedfs-template-npeshapeblue/cloudstack:sharedfs-template-npeCopy head branch name to clipboard

Conversation

abh1sar commented Aug 20, 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!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

abh1sar commented Aug 20, 2026

Uh oh!

blueorangutan commented Aug 20, 2026

Uh oh!

blueorangutan commented Aug 20, 2026

Uh oh!

DaanHoogland commented Aug 26, 2026

Uh oh!

GaOrtiga commented Aug 26, 2026

Uh oh!

github-actions Bot commented Sep 8, 2026

Uh oh!

DaanHoogland commented Sep 9, 2026

Uh oh!

abh1sar commented Sep 9, 2026

Uh oh!

abh1sar commented Sep 9, 2026

Uh oh!

blueorangutan commented Sep 9, 2026

Uh oh!

blueorangutan commented Sep 9, 2026

Uh oh!

abh1sar commented Sep 10, 2026

Uh oh!

blueorangutan commented Sep 10, 2026

Uh oh!

blueorangutan commented Sep 10, 2026

Uh oh!

RosiKyu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

SharedFS: fix NPE when accessing systemvm templates for unsupported hypervisors#13930
RosiKyu merged 5 commits into
apache:4.22from
shapeblue:sharedfs-template-npe

codecov Bot commented Aug 20, 2026 •
edited
Loading

RosiKyu left a comment •
edited
Loading