FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

CSTACKEX-261: enabling cloudstack volume resize (GROW) for iscsi and nfs by sathvikaragi · Pull Request #100 · NetApp/cloudstack · GitHub

  1. NetApp
  2. cloudstack

Repository navigation

CSTACKEX-261: enabling cloudstack volume resize (GROW) for iscsi and nfs #100

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

Merged
sathvikaragi merged 22 commits into from
Oct 12, 2026
Conversation 48 Commits 22 Checks 12 Files changed
Merged

CSTACKEX-261: enabling cloudstack volume resize (GROW) for iscsi and nfs #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
531c80a
CSTACKEX-261: enabling cloudstack volume resize (GROW) for iscsi and nfs
sathvikaragi Sep 15, 2026
91847be
CSTACKEX-261: RESOLVING COMMENTS
sathvikaragi Sep 23, 2026
3b2be0c
CSTACKEX-261: RESOLVING COMMENTS - PT2
sathvikaragi Sep 23, 2026
067268d
CSTACKEX-261: resolving comments and build issues
sathvikaragi Sep 23, 2026
c9f59ea
CSTACKEX-261: Adding more UT's
sathvikaragi Sep 23, 2026
82c7d15
CSTACKEX-261: handling casee where lun is deleted on ontap and trying…
sathvikaragi Sep 23, 2026
57f98f2
CSTACKEX-261: adding more UT's and any null checks
sathvikaragi Sep 24, 2026
ca6e07e
CSTACKEX-261: resolving comments
sathvikaragi Sep 29, 2026
6e53989
CSTACKEX-261: Updating the UT's based on changes
sathvikaragi Sep 29, 2026
44ad4e0
CSTACKEX-261: changing the exception for shrinking to unable to shrin…
sathvikaragi Sep 29, 2026
ba5e7bc
CSTCAKEX-261: fetching only space field from ontap instead of the who…
sathvikaragi Oct 5, 2026
c6ecf8f
Merge branch 'main' into feature/CSTACKEX-261
sathvikaragi Oct 5, 2026
d974282
CSTCAKEX-261: fixing build failures
sathvikaragi Oct 5, 2026
009571d
CSTACKEX-261: small fixes
sathvikaragi Oct 5, 2026
dea8937
Merge branch 'main' into feature/CSTACKEX-261
sathvikaragi Oct 8, 2026
d89b007
CSTACKEX-261: fixing build failures
sathvikaragi Oct 8, 2026
a68c1dc
CSTACKEX-261: fixing build failures-2
sathvikaragi Oct 8, 2026
8e9d98c
Merge branch 'main' into feature/CSTACKEX-261
sathvikaragi Oct 8, 2026
04da9b6
CSTACKEX-261: fixing the build failure after resolving merge conflicts
sathvikaragi Oct 8, 2026
d66f74e
[CSTACKEX-328] Rebase and Resolve Merge conflicts
Oct 8, 2026
189be5a
[CSTACKEX-328] Rebase and Resolve Merge conflicts
Oct 8, 2026
cdcdf7d
[CSTACKEX-328] Fix ISCSI qos issue
Oct 8, 2026
File filter

Filter by extension

Filter by extension .java  (11) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
6 changes: 3 additions & 3 deletions api/src/main/java/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.command.user.volume;
import org.apache.cloudstack.api.BaseAsyncCmd;

import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiArgValidator;
import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
Expand Down Expand Up @@ -60,7 +60,7 @@ public class ResizeVolumeCmd extends BaseAsyncCmd implements UserCmd {
@Parameter(name = ApiConstants.MAX_IOPS, type = CommandType.LONG, required = false, description = "New maximum number of IOPS")
private Long maxIops;

@Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, required = false, description = "New volume size in GB")
@Parameter(name = ApiConstants.SIZE, type = CommandType.LONG, required = false, description = "New volume size in GB",validations = {ApiArgValidator.PositiveNumber})
Comment thread
sathvikaragi marked this conversation as resolved.
Resolved
private Long size;

@Parameter(name = ApiConstants.SHRINK_OK, type = CommandType.BOOLEAN, required = false, description = "Verify OK to Shrink")
Expand Down
257 changes: 173 additions & 84 deletions ...ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
Show comments
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/VolumeFeignClient.java
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public interface VolumeFeignClient {

@RequestLine("GET /api/storage/volumes/{uuid}")
@Headers({"Authorization: {authHeader}"})
Volume getVolumeByUUID(@Param("authHeader") String authHeader, @Param("uuid") String uuid);
Volume getVolumeByUUID(@Param("authHeader") String authHeader, @Param("uuid") String uuid, @QueryMap Map<String, Object> queryParams);

@RequestLine("GET /api/storage/volumes")
@Headers({"Authorization: {authHeader}"})
Expand Down
51 changes: 40 additions & 11 deletions ...age/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,25 @@

package org.apache.cloudstack.storage.service;

import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;

import com.cloud.utils.StringUtils;
import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.feign.FeignClientFactory;
import org.apache.cloudstack.storage.feign.client.AggregateFeignClient;
import org.apache.cloudstack.storage.feign.client.ClusterFeignClient;
import org.apache.cloudstack.storage.feign.client.EmsFeignClient;
import org.apache.cloudstack.storage.feign.client.JobFeignClient;
import org.apache.cloudstack.storage.feign.client.NASFeignClient;
import org.apache.cloudstack.storage.feign.client.NetworkFeignClient;
import org.apache.cloudstack.storage.feign.client.QosFeignClient;
import org.apache.cloudstack.storage.feign.client.SANFeignClient;
import org.apache.cloudstack.storage.feign.client.SnapshotFeignClient;
import org.apache.cloudstack.storage.feign.client.EmsFeignClient;
import org.apache.cloudstack.storage.feign.client.SvmFeignClient;
import org.apache.cloudstack.storage.feign.client.VolumeFeignClient;
import org.apache.cloudstack.storage.feign.model.Aggregate;
Expand All @@ -53,12 +55,12 @@
import org.apache.cloudstack.storage.feign.model.VolumeQosPolicy;
import org.apache.cloudstack.storage.feign.model.response.JobResponse;
import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.service.model.AccessGroup;
import org.apache.cloudstack.storage.service.model.CloudStackVolume;
import org.apache.cloudstack.storage.service.model.ProtocolType;
import org.apache.cloudstack.storage.utils.OntapStorageConstants;
import org.apache.cloudstack.storage.utils.OntapStorageUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand All @@ -67,7 +69,6 @@

import feign.FeignException;

import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
/**
* Storage Strategy represents the communication path for all the ONTAP storage options
*
Expand Down Expand Up @@ -605,15 +606,38 @@ public void deleteStorageVolume(Volume volume) {
}

/**
* Gets ONTAP Flex-Volume
* Eligible only for Unified ONTAP storage
* throw exception in case of disaggregated ONTAP storage
* Gets an ONTAP FlexVolume by UUID.
* Eligible only for Unified ONTAP storage.
* Throws exception in case of disaggregated ONTAP storage.
*
* @param volume the volume to retrieve
* @return the retrieved Volume object
* <p>Callers pass ONTAP query parameters when they need a partial record. For example,
* {@code fields=space.used} returns only used space instead of the full volume.
* A null or empty map returns the default volume representation.</p>
*
* @param uuid the UUID of the volume to retrieve
* @param queryParams ONTAP query parameters applied to {@code GET /storage/volumes/{uuid}};
* may be null
* @return the retrieved Volume object, or null if not found
*/
public Volume getStorageVolume(Volume volume) {
return null;
public Volume getStorageVolume(String uuid, Map<String, Object> queryParams) {
if (StringUtils.isBlank(uuid)) {
throw new CloudRuntimeException("Cannot fetch ONTAP volume: UUID is null or empty");
}
Map<String, Object> params = queryParams != null ? queryParams : Collections.emptyMap();
logger.info("getStorageVolume: Fetching ONTAP volume [{}] with query params {}", uuid, params);
String authHeader = OntapStorageUtils.generateAuthHeader(storage.getUsername(), storage.getPassword());
try {
Volume fetchedVolume = volumeFeignClient.getVolumeByUUID(authHeader, uuid, params);
logger.info("getStorageVolume: Volume [{}] fetched successfully", uuid);
return fetchedVolume;
} catch (FeignException e) {
if (OntapStorageUtils.isOntapObjectNotFoundError(e)) {
logger.warn("getStorageVolume: Volume [{}] not found in ONTAP", uuid);
return null;
}
logger.error("getStorageVolume: Exception while fetching volume [{}]: ", uuid, e);
throw new CloudRuntimeException("Failed to fetch volume: " + e.getMessage());
}
}

/**
Expand Down Expand Up @@ -867,6 +891,11 @@ abstract public CloudStackVolume createTemplateCache(StoragePoolVO storagePool,
*
* <p>Needed after cloning a cached template, because a clone inherits the size of its source
* while the service offering may ask for a larger disk.</p>
*
* <p>When the request already carries a QoS policy on the LUN or file, that policy is applied
* as part of this resize. iSCSI sends one LUN update with the new size and the policy.
* NFS grows the file on the host, then updates the file policy. A request with no policy
* changes size only.</p>
*/
abstract public void resizeCloudStackVolume(CloudStackVolume cloudstackVolume, long sizeInBytes);

Expand Down
15 changes: 13 additions & 2 deletions .../volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import com.cloud.agent.api.storage.ResizeVolumeCommand;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.host.HostVO;
import com.cloud.storage.ResizeVolumePayload;
import com.cloud.storage.Storage;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.VolumeDao;
Expand Down Expand Up @@ -247,6 +248,9 @@ public void resizeCloudStackVolume(CloudStackVolume cloudstackVolume, long sizeI
logger.error("resizeCloudStackVolume: " + errMsg);
throw new CloudRuntimeException(errMsg);
}
if (cloudstackVolume.getFile() != null && cloudstackVolume.getFile().getQosPolicy() != null) {
updateCloudStackVolume(cloudstackVolume);
}
logger.info("resizeCloudStackVolume: Resized volume [{}] to {} bytes", volumeInfo.getUuid(), sizeInBytes);
}

Expand All @@ -262,8 +266,15 @@ private Answer resizeVolumeOnKVMHost(DataObject volumeInfo, long sizeInBytes) {
throw new CloudRuntimeException("Storage Pool not found for id: " + volume.getPoolId());
}

ResizeVolumeCommand cmd = new ResizeVolumeCommand(volume.getPath(), new StorageFilerTO(storagePool),
volume.getSize(), sizeInBytes, false, null);
// instanceName is set by VolumeApiServiceImpl.orchestrateResizeVolume() before calling the
// driver — it is the VM instance name when attached, or "none" when the volume is detached.
ResizeVolumePayload resizePayload = volumeObject.getpayload() instanceof ResizeVolumePayload
Comment thread
sathvikaragi marked this conversation as resolved.
Resolved
? (ResizeVolumePayload) volumeObject.getpayload()
: null;
String instanceName = resizePayload != null ? resizePayload.instanceName : "none";
ResizeVolumeCommand cmd = new ResizeVolumeCommand(volume.getPath(), new StorageFilerTO(storagePool),
Comment thread
sathvikaragi marked this conversation as resolved.
Resolved
volume.getSize(), sizeInBytes, false, instanceName);

EndPoint ep = epSelector.select(volumeInfo);
if (ep == null) {
String errMsg = "No remote endpoint to send ResizeVolumeCommand, check if host is up";
Expand Down
92 changes: 57 additions & 35 deletions .../volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,24 @@

package org.apache.cloudstack.storage.service;

import com.cloud.host.HostVO;
import com.cloud.utils.exception.CloudRuntimeException;
import feign.FeignException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import javax.inject.Inject;

import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.feign.model.CliSnapshotRestoreRequest;
import org.apache.cloudstack.storage.feign.model.Igroup;
import org.apache.cloudstack.storage.feign.model.Initiator;
import org.apache.cloudstack.storage.feign.model.Svm;
import org.apache.cloudstack.storage.feign.model.OntapStorage;
import org.apache.cloudstack.storage.feign.model.Lun;
import org.apache.cloudstack.storage.feign.model.LunMap;
import org.apache.cloudstack.storage.feign.model.LunSpace;
import org.apache.cloudstack.storage.feign.model.CliSnapshotRestoreRequest;
import org.apache.cloudstack.storage.feign.model.OntapStorage;
import org.apache.cloudstack.storage.feign.model.Svm;
import org.apache.cloudstack.storage.feign.model.VolumeQosPolicy;
import org.apache.cloudstack.storage.feign.model.response.JobResponse;
import org.apache.cloudstack.storage.feign.model.response.OntapResponse;
import org.apache.cloudstack.storage.service.model.AccessGroup;
Expand All @@ -41,18 +45,24 @@
import org.apache.cloudstack.storage.utils.OntapStorageConstants;
import org.apache.cloudstack.storage.utils.OntapStorageUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import com.cloud.host.HostVO;
import com.cloud.storage.VolumeDetailVO;
import com.cloud.storage.dao.VolumeDetailsDao;
import com.cloud.utils.exception.CloudRuntimeException;

import feign.FeignException;

public class UnifiedSANStrategy extends SANStrategy {

private static final Logger logger = LogManager.getLogger(UnifiedSANStrategy.class);
@Inject
private StoragePoolDetailsDao storagePoolDetailsDao;
@Inject
private VolumeDetailsDao volumeDetailsDao;

public UnifiedSANStrategy(OntapStorage ontapStorage) {
super(ontapStorage);
Expand Down Expand Up @@ -186,24 +196,7 @@ private void bestEffortDeleteTemplateCacheLun(String svmName, String lunName, St

@Override
public CloudStackVolume updateCloudStackVolume(CloudStackVolume cloudstackVolume) {
if (cloudstackVolume == null || cloudstackVolume.getLun() == null
|| cloudstackVolume.getLun().getUuid() == null) {
throw new CloudRuntimeException("Invalid iSCSI volume QoS update request");
}
Lun lunUpdate = new Lun();
lunUpdate.setQosPolicy(cloudstackVolume.getLun().getQosPolicy());
try {
JobResponse response = sanFeignClient.updateLun(
getAuthHeader(), cloudstackVolume.getLun().getUuid(), lunUpdate);
pollJobIfPresent(response, "update QoS policy on LUN [" + cloudstackVolume.getLun().getUuid() + "]");
} catch (FeignException e) {
throw new CloudRuntimeException("Failed to apply QoS policy to LUN: " + e.getMessage(), e);
}
logger.info("Applied QoS policy [{}] to LUN [{}]",
cloudstackVolume.getLun().getQosPolicy() != null
? cloudstackVolume.getLun().getQosPolicy().getName() : null,
cloudstackVolume.getLun().getUuid());
return cloudstackVolume;
return null;
}

@Override
Expand Down Expand Up @@ -267,6 +260,7 @@ public CloudStackVolume cloneCloudStackVolume(CloudStackVolume cloudstackVolume)

CloudStackVolume clonedCloudStackVolume = new CloudStackVolume();
clonedCloudStackVolume.setLun(lun);
clonedCloudStackVolume.setVolumeInfo(cloudstackVolume.getVolumeInfo());
return clonedCloudStackVolume;
} catch (FeignException e) {
logger.error("FeignException occurred while cloning LUN: {}, Status: {}, Exception: {}",
Expand Down Expand Up @@ -299,29 +293,57 @@ private void validateCreatedLun(Lun lun, String requestName, String operation) {
*/
@Override
public void resizeCloudStackVolume(CloudStackVolume cloudstackVolume, long sizeInBytes) {
if (cloudstackVolume == null || cloudstackVolume.getLun() == null || cloudstackVolume.getLun().getUuid() == null) {
if (cloudstackVolume == null || cloudstackVolume.getVolumeInfo() == null) {
logger.error("resizeCloudStackVolume: Lun resize failed. Invalid request: {}", cloudstackVolume);
throw new CloudRuntimeException("Failed to resize Lun, invalid request");
}
if (sizeInBytes <= 0) {

sandeeplocharla Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This check should be at the UI level.
As shrink is not supported, this check could rather be 'sizeInBytes <= currentSizeInBytes'

sathvikaragi Oct 8, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

in case of shrink we throw an error in driver before even sanstrategy is called hence no need to add it here. This below part of code is there in driver already.
if (payload.newSize < volumeVO.getSize()) {
throw new CloudRuntimeException("Unable to shrink volume.");
}
This check was added as a part of template cache PR when resize is triggered as a part of VM creation with root disk size inputted greater than template it tries to resize. In that flow he wanted to check for positive input validation.

sandeeplocharla Oct 11, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

This is dead code in that case then
throw new CloudRuntimeException("Failed to resize Lun, invalid size " + sizeInBytes);
}

// Resolve LUN UUID from volume details when not pre-populated on the cloudstackVolume
// Keep a QoS policy already set on the request so size and QoS go out in one LUN update.
VolumeQosPolicy qosPolicy = cloudstackVolume.getLun() != null ? cloudstackVolume.getLun().getQosPolicy() : null;
if (cloudstackVolume.getLun() == null || cloudstackVolume.getLun().getUuid() == null) {
logger.debug("LUN details not present on cloudstackVolume, resolving UUID from volume details");
long volumeId = cloudstackVolume.getVolumeInfo().getId();
Comment thread
sathvikaragi marked this conversation as resolved.
Resolved
VolumeDetailVO lunUuidDetail = volumeDetailsDao.findDetail(volumeId, OntapStorageConstants.LUN_DOT_UUID);

suryag1201 Sep 28, 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.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

check findDetails by key is present or not,
if yes then replace this method call

sathvikaragi Sep 29, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Here we are fetching the details by the key LUN UUID only
if (lunUuidDetail == null || StringUtils.isBlank(lunUuidDetail.getValue())) {
throw new CloudRuntimeException("LUN UUID not found in volume details for volume " + volumeId);
}
Lun resolvedLun = new Lun();
resolvedLun.setUuid(lunUuidDetail.getValue());
cloudstackVolume.setLun(resolvedLun);
} else {
logger.debug("resizeCloudStackVolume: LUN UUID [{}] already present on cloudstackVolume, skipping volume details lookup", cloudstackVolume.getLun().getUuid());
}

String lunUuid = cloudstackVolume.getLun().getUuid();
logger.trace("resizeCloudStackVolume: Resizing Lun {} to {} bytes", lunUuid, sizeInBytes);
try {
String authHeader = OntapStorageUtils.generateAuthHeader(storage.getUsername(), storage.getPassword());
LunSpace lunSpace = new LunSpace();
lunSpace.setSize(sizeInBytes);
Lun patch = new Lun();
patch.setSpace(lunSpace);
JobResponse response = sanFeignClient.updateLun(authHeader, lunUuid, patch);
Lun lunPatch = new Lun();
lunPatch.setSpace(lunSpace);
lunPatch.setQosPolicy(qosPolicy);
JobResponse response = sanFeignClient.updateLun(authHeader, lunUuid, lunPatch);
pollJobIfPresent(response, "resize Lun [" + lunUuid + "]");
logger.debug("resizeCloudStackVolume: Lun {} resized to {} bytes", lunUuid, sizeInBytes);
} catch (FeignException e) {
throw new CloudRuntimeException("Failed to resize Lun: " + e.getMessage(), e);
logger.error("FeignException occurred while resizing LUN [{}], Status: {}, Exception: {}",
lunUuid, e.status(), e.getMessage());
if (OntapStorageUtils.isOntapObjectNotFoundError(e)) {
throw new CloudRuntimeException(String.format(
"LUN [%s] no longer exists on ONTAP; it may have been deleted externally. " +
"Verify the LUN is present before retrying the resize.", lunUuid));
}
throw new CloudRuntimeException(String.format(
"Failed to resize LUN [%s]: %s",lunUuid, e.getMessage()));
} catch (Exception e) {
logger.error("Exception occurred while resizing LUN: {}, Exception: {}", lunUuid, e.getMessage());
throw new CloudRuntimeException("Failed to resize Lun: " + e.getMessage());
logger.error("Exception occurred while resizing LUN [{}]: {}", lunUuid, e.getMessage());
throw new CloudRuntimeException(String.format(
"Unexpected error while resizing LUN [%s]: %s", lunUuid, e.getMessage()));
}
}

Expand Down
2 changes: 2 additions & 0 deletions ...volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageConstants.java
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public class OntapStorageConstants {
// Query params
public static final String NAME = "name";
public static final String FIELDS = "fields";
/** ONTAP volume field: bytes consumed, {@code space.used}. */
public static final String SPACE_USED = "space.used";
public static final String CLUSTER_NODE_ASUP_FIELDS = "model,is_all_flash_optimized,is_capacity_optimized,is_perf_optimized";
public static final String INITIATORS = "initiators";
public static final String AGGREGATES = "aggregates";
Expand Down
Loading
Loading
Back | FazBrowse Home | New Git URL