create temp CG for consistent VM snapshot for the VM which is span across multiple flexvolumes#74
Open
rajiv-jain-netapp wants to merge 13 commits into
Open
create temp CG for consistent VM snapshot for the VM which is span across multiple flexvolumes#74rajiv-jain-netapp wants to merge 13 commits into
rajiv-jain-netapp wants to merge 13 commits into
Conversation
… multiple volumes at storage
… at multiple flexvolumes
…ective checks by which delete snapshot would be handled from primary only
rajiv-jain-netapp
requested review from
piyush5netapp,
sandeeplocharla and
suryag1201
as code owners
Author
|
testing results and all the executed test cases added under previous PR #67 |
sandeeplocharla
left a comment
sandeeplocharla
left a comment
Collaborator
There was a problem hiding this comment.
Partially reviewed. Still need to go through a good portion of OntapVMSnapshotStrategy.java and SnapshotManagerImpl.java
There was a problem hiding this comment.
Pull request overview
This PR enhances NetApp ONTAP managed-storage snapshot handling by ensuring VM snapshots remain consistent when a VM’s volumes span multiple FlexVols, and by preventing managed PRIMARY (array-native) volume snapshots from being incorrectly archived/bookkept as secondary snapshots.
Changes:
- Add a temporary ONTAP Consistency Group (CG) two-phase snapshot flow for VM snapshots spanning multiple FlexVols; keep a direct FlexVol snapshot fast-path for single-FlexVol VMs.
- Ensure managed PRIMARY volume snapshots (e.g., ONTAP volume snapshots) remain on primary/array storage and do not use secondary-archive bookkeeping paths.
- Extend ONTAP integration utilities/strategy to better separate “provisioning-time” aggregate validation from “operations-only” connectivity, and add CG REST client APIs + related unit tests.
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java | Avoids archiving managed PRIMARY snapshots to secondary; refactors decision into archiveSnapshotToSecondary. |
| plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategy.java | Implements temporary CG orchestration for multi-FlexVol VM snapshots, plus single-FlexVol direct snapshot path and improved naming. |
| plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java | Adds operations-only connect mode, job polling helpers, and centralized FlexVol snapshot delete orchestration. |
| plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java | Adds snapshot naming helpers and an overload to connect with/without aggregate validation. |
| plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageConstants.java | Adds SVM UUID support and CG/SFSR/delete polling constants. |
| plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java | Persists resolved SVM UUID into pool details when available. |
| plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SnapshotFeignClient.java | Adds ONTAP CG REST API endpoints (create/list CG, start/commit snapshot, delete CG). |
| plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java | Delegates volume-snapshot delete/revert to strategy helpers; updates naming and makes delete more robust/idempotent. |
| plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/vmsnapshot/OntapVMSnapshotStrategyTest.java | Adds/updates unit tests for CG flow, naming, scope resolution, and avoids static utility connection issues. |
| plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/service/StorageStrategyTest.java | Adds tests for operations-only connect, job polling helpers, and FlexVol snapshot delete orchestration. |
| plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriverTest.java | Updates capabilities expectations to include revert support. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| return null; | ||
| } | ||
|
|
||
| private String getStringField(Map<String, Object> record, String key) { |
Collaborator
There was a problem hiding this comment.
This can be in utils, instead.
| if (eligibleAggregates.isEmpty()) { | ||
| logger.error("No suitable aggregates found on SVM " + svmName + " for volume operations."); | ||
| throw new CloudRuntimeException("No suitable aggregates found on SVM " + svmName + " for volume operations."); | ||
| this.resolvedSvmUuid = svm.getUuid(); |
There was a problem hiding this comment.
Since we are fetching svm uuid now , lets explicitly add uuid in queryParams
Author
There was a problem hiding this comment.
I did not get this comment
suryag1201
reviewed
Jul 7, 2026
Comment on lines
720
to
+724
| VolumeDetailVO lunDetail = volumeDetailsDao.findDetail(volumeVO.getId(), OntapStorageConstants.LUN_DOT_UUID); | ||
| String lunUUID = lunDetail != null ? lunDetail.getValue() : null; | ||
| if (lunUUID == null) { | ||
| if (lunDetail.getValue() == null) { | ||
| throw new CloudRuntimeException("LUN UUID not found for iSCSI volume " + volumeVO.getId()); | ||
| } | ||
| lunUuid = lunDetail.getValue(); |
Comment on lines
+977
to
+981
| /** | ||
| * Single GET attempt: try to match by name, | ||
| * then fall back to listing all CG snapshots in this group (And it would be one | ||
| * always since workflow is keep deleting the CG). | ||
| */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR...
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?