Skip to content

Support Linstor Primary Storage for NAS BnR#12796

Open
abh1sar wants to merge 4 commits intoapache:4.22from
shapeblue:linstor-nas
Open

Support Linstor Primary Storage for NAS BnR#12796
abh1sar wants to merge 4 commits intoapache:4.22from
shapeblue:linstor-nas

Conversation

@abh1sar
Copy link
Contributor

@abh1sar abh1sar commented Mar 12, 2026

Description

This PR fixes #12218

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?

  1. Backup from Linstor Primary Storage to NAS NFS backup repository
  2. Restore from Backup to Linstor Primary Storage
  3. Create new Instance from Backup to Linstor Primary Storage
  4. Restore Backup to NFS Primary Storage
  5. Create new Instance from Backup to NFS Primary Storage

Validated Data after Restore.

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

@abh1sar abh1sar requested a review from sureshanaparti March 12, 2026 06:33
@codecov
Copy link

codecov bot commented Mar 12, 2026 •
edited
Loading

Codecov Report

❌ Patch coverage is 21.91781% with 57 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.60%. Comparing base (7048944) to head (9af274b).

Files with missing lines Patch % Lines
...ce/wrapper/LibvirtRestoreBackupCommandWrapper.java 30.18% 33 Missing and 4 partials ⚠️
...rg/apache/cloudstack/backup/NASBackupProvider.java 0.00% 14 Missing ⚠️
...apache/cloudstack/backup/RestoreBackupCommand.java 0.00% 6 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               4.22   #12796      +/-   ##
============================================
- Coverage     17.61%   17.60%   -0.01%     
  Complexity    15662    15662              
============================================
  Files          5917     5917              
  Lines        531415   531461      +46     
  Branches      64973    64984      +11     
============================================
+ Hits          93588    93589       +1     
- Misses       427271   427313      +42     
- Partials      10556    10559       +3
Flag Coverage Δ
uitests 3.70% <ø> (ø)
unittests 18.68% <21.91%> (-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.

sureshanaparti
sureshanaparti reviewed Mar 12, 2026
View reviewed changes
plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
volumePathPrefix = storagePool.getPath();
volumePathPrefix = storagePool.getPath() + "/";
} else if (Storage.StoragePoolType.Linstor.equals(storagePool.getPoolType())) {
volumePathPrefix = "/dev/drbd/by-res/cs-";
Copy link
Contributor

@sureshanaparti sureshanaparti Mar 12, 2026

Choose a reason for hiding this comment

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

can keep this path in LinstorUtil, and use it here

Copy link
Contributor Author

@abh1sar abh1sar Mar 13, 2026

Choose a reason for hiding this comment

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

Can't access LinstorUtil from here.

@sureshanaparti sureshanaparti linked an issue Mar 12, 2026 that may be closed by this pull request
Create Instance from Backup Failed #12218
Open
@sureshanaparti sureshanaparti requested a review from rp- March 12, 2026 07:40
@sureshanaparti sureshanaparti added this to the 4.22.1 milestone Mar 12, 2026
@sureshanaparti
Copy link
Contributor

sureshanaparti commented Mar 12, 2026

Hi @rp- Can you perform some tests with this PR changes and confirm?

abh1sar added 3 commits March 14, 2026 06:47
@abh1sar
Apply suggestions from code review
33f73b0 
Co-authored-by: Abhisar Sinha <63767682+abh1sar@users.noreply.github.com>
@abh1sar
Merge branch '4.22' into linstor-nas
8b71117
@abh1sar
Fix UT
9af274b
@abh1sar
Copy link
Contributor Author

abh1sar commented Mar 14, 2026

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Mar 14, 2026

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

@blueorangutan
Copy link

blueorangutan commented Mar 14, 2026

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

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

Reviewers

@sureshanaparti sureshanaparti sureshanaparti left review comments

@rp- rp- Awaiting requested review from rp-

Assignees

No one assigned

Labels

component:backup component:kvm status:needs-testing

Projects

Apache CloudStack 4.22.1
Status: In Progress

Milestone

4.22.1

Development

Successfully merging this pull request may close these issues.

Create Instance from Backup Failed

3 participants

@abh1sar @sureshanaparti @blueorangutan