Skip to content

server,engine-schema: allow retrieving volume stats for stopped vms #12868

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

Draft
shwstppr wants to merge 1 commit into
base: 4.20
Choose a base branch
from
+20 −2
Draft

server,engine-schema: allow retrieving volume stats for stopped vms #12868

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
2 changes: 2 additions & 0 deletions engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,6 @@ List<VMInstanceVO> searchRemovedByRemoveDate(final Date startDate, final Date en
int getVmCountByOfferingId(Long serviceOfferingId);

int getVmCountByOfferingNotInDomain(Long serviceOfferingId, List<Long> domainIds);

List<Long> listIdsByHostIdForVolumeStats(long hostIds);
}
16 changes: 16 additions & 0 deletions engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,4 +1261,20 @@ public int getVmCountByOfferingNotInDomain(Long serviceOfferingId, List<Long> do
List<Integer> count = customSearch(sc, null);
return count.get(0);
}

@Override
public List<Long> listIdsByHostIdForVolumeStats(long hostId) {
GenericSearchBuilder<VMInstanceVO, Long> sb = createSearchBuilder(Long.class);
sb.selectFields(sb.entity().getId());
sb.and().op("host", sb.entity().getHostId(), SearchCriteria.Op.EQ);
sb.or().op("hostNull", sb.entity().getHostId(), Op.NULL);
sb.and("lastHost", sb.entity().getLastHostId(), SearchCriteria.Op.EQ);
sb.cp();
sb.cp();
sb.done();
SearchCriteria<Long> sc = sb.create();
sc.setParameters("host", hostId);
sc.setParameters("lastHost", hostId);
return customSearch(sc, null);
}
}
4 changes: 2 additions & 2 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,9 +2273,9 @@ public HashMap<String, VolumeStatsEntry> getVolumeStatistics(long clusterId, Str
}

private List<String> getVolumesByHost(HostVO host, StoragePool pool){
List<VMInstanceVO> vmsPerHost = _vmInstanceDao.listByHostId(host.getId());
List<Long> vmsPerHost = _vmInstanceDao.listIdsByHostIdForVolumeStats(host.getId());
return vmsPerHost.stream()
.flatMap(vm -> _volsDao.findNonDestroyedVolumesByInstanceIdAndPoolId(vm.getId(),pool.getId()).stream().map(vol ->
.flatMap(vmId -> _volsDao.findNonDestroyedVolumesByInstanceIdAndPoolId(vmId,pool.getId()).stream().map(vol ->
vol.getState() == Volume.State.Ready ? (vol.getFormat() == ImageFormat.OVA ? vol.getChainInfo() : vol.getPath()) : null).filter(Objects::nonNull))
.collect(Collectors.toList());
}
Expand Down
Loading