Skip to content

Updated listStoragePools response - added new managed parameter #9588

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
yadvr merged 1 commit into from
Sep 4, 2024
Merged

Updated listStoragePools response - added new managed parameter #9588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/response/StoragePoolResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ public class StoragePoolResponse extends BaseResponseWithAnnotations {
@Param(description = "the storage pool capabilities")
private Map<String, String> caps;

@SerializedName(ApiConstants.MANAGED)
@Param(description = "whether this pool is managed or not")
private Boolean managed;

public Map<String, String> getCaps() {
return caps;
}
Expand Down Expand Up @@ -383,4 +387,12 @@ public Boolean getTagARule() {
public void setTagARule(Boolean tagARule) {
isTagARule = tagARule;
}

public Boolean getManaged() {
return managed;
}

public void setManaged(Boolean managed) {
this.managed = managed;
}
}
13 changes: 13 additions & 0 deletions server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ public StoragePoolResponse newStoragePoolResponse(StoragePoolJoinVO pool, boolea
poolResponse.setTags(pool.getTag());
poolResponse.setIsTagARule(pool.getIsTagARule());
poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));
poolResponse.setManaged(storagePool.isManaged());

// set async job
if (pool.getJobId() != null) {
Expand Down Expand Up @@ -203,6 +204,7 @@ public StoragePoolResponse setStoragePoolResponse(StoragePoolResponse response,

@Override
public StoragePoolResponse newStoragePoolForMigrationResponse(StoragePoolJoinVO pool) {
StoragePool storagePool = storagePoolDao.findById(pool.getId());
StoragePoolResponse poolResponse = new StoragePoolResponse();
poolResponse.setId(pool.getUuid());
poolResponse.setName(pool.getName());
Expand All @@ -229,6 +231,17 @@ public StoragePoolResponse newStoragePoolForMigrationResponse(StoragePoolJoinVO
poolResponse.setDiskSizeTotal(pool.getCapacityBytes());
poolResponse.setDiskSizeAllocated(allocatedSize);
poolResponse.setCapacityIops(pool.getCapacityIops());

if (storagePool != null) {
poolResponse.setManaged(storagePool.isManaged());
if (storagePool.isManaged()) {
DataStore store = dataStoreMgr.getDataStore(pool.getId(), DataStoreRole.Primary);
PrimaryDataStoreDriver driver = (PrimaryDataStoreDriver) store.getDriver();
long usedIops = driver.getUsedIops(storagePool);
poolResponse.setAllocatedIops(usedIops);
Copy link
Contributor Author

@sureshanaparti sureshanaparti Aug 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

this code is sync with the response parameters set for managed pools here:

cloudstack/server/src/main/java/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java

Lines 147 to 151 in 674129c

if (storagePool.isManaged()) {
DataStore store = dataStoreMgr.getDataStore(pool.getId(), DataStoreRole.Primary);
PrimaryDataStoreDriver driver = (PrimaryDataStoreDriver) store.getDriver();
long usedIops = driver.getUsedIops(storagePool);
poolResponse.setAllocatedIops(usedIops);

}
}

poolResponse.setOverProvisionFactor(Double.toString(CapacityManager.StorageOverprovisioningFactor.valueIn(pool.getId())));

// TODO: StatsCollector does not persist data
Expand Down