Skip to content

CSTACKEX-246: setting volume format based on protocol so resize can be done #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sathvikaragi wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −4
Open

CSTACKEX-246: setting volume format based on protocol so resize can be done #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6007042
CSTACKEX-246: setting volume format based on protocol
sathvikaragi Aug 13, 2026
4039316
CSTACKEX-246: fixing a small error
sathvikaragi Aug 13, 2026
c027765
CSTACKEX-246: Added provider check with the null check
sathvikaragi Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .../storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,11 @@ protected Void managedCopyBaseImageCallback(AsyncCallbackDispatcher<VolumeServic
volume.setPath(templateObjectTo.getPath());

if (templateObjectTo.getFormat() != null) {
volume.setFormat(templateObjectTo.getFormat());
PrimaryDataStore primaryDataStore = context.getPrimaryDataStore();
boolean isOntap = primaryDataStore != null && DataStoreProvider.ONTAP_PLUGIN_NAME.equals(primaryDataStore.getStorageProviderName());
if (!isOntap || volume.getFormat() == null) {
volume.setFormat(templateObjectTo.getFormat());
}
}

volDao.update(volume.getId(), volume);
Expand Down
11 changes: 8 additions & 3 deletions ...ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public void createAsync(DataStore dataStore, DataObject dataObject, AsyncComplet

volumeVO.setPoolType(storagePool.getPoolType());
volumeVO.setPoolId(storagePool.getId());
volumeVO.setFormat(getImageFormatByHypervisor(storagePool.getHypervisor()));
volumeVO.setFormat(getImageFormatByHypervisor(storagePool.getHypervisor(), details.get(OntapStorageConstants.PROTOCOL)));
logger.info("createAsync: Volume format set to [{}] for hypervisor [{}]", volumeVO.getFormat(), storagePool.getHypervisor());

if (ProtocolType.ISCSI.name().equalsIgnoreCase(details.get(OntapStorageConstants.PROTOCOL))) {
Expand Down Expand Up @@ -988,9 +988,14 @@ private String buildSnapshotName(String cloudStackSnapshotName, long snapshotId)
}


private Storage.ImageFormat getImageFormatByHypervisor(HypervisorType hypervisorType) {
private Storage.ImageFormat getImageFormatByHypervisor(HypervisorType hypervisorType, String protocol) {

@suryag1201 suryag1201 Aug 17, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Also, update the unit test cases and automation also

if (HypervisorType.KVM.equals(hypervisorType)) {

@suryag1201 suryag1201 Aug 17, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

use switch instead multiple if else

return Storage.ImageFormat.QCOW2;
if (ProtocolType.NFS3.name().equalsIgnoreCase(protocol)) {
return Storage.ImageFormat.QCOW2;
} else if (ProtocolType.ISCSI.name().equalsIgnoreCase(protocol)) {
return Storage.ImageFormat.RAW;
}
throw new CloudRuntimeException("Unsupported protocol [" + protocol + "] for ONTAP image format resolution");
}
throw new CloudRuntimeException("Unsupported hypervisor [" + hypervisorType + "] for ONTAP image format resolution");
}
Expand Down
Loading