etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE on primary storage delete (#11817)

This commit is contained in:
Henrique Sato 2026-01-20 04:12:16 -03:00 committed by GitHub
parent 2a6ce0c8a8
commit 03d24ff851
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/com/cloud/storage/StorageManagerImpl.java
View File

@ -1558,14 +1558,18 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C
protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) { protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null).stream().filter(vol -> vol.getState() != Volume.State.Destroy).collect(Collectors.toList()); List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null);
VMInstanceVO volInstance; VMInstanceVO volInstance;
List<String> logMessageInfo = new ArrayList<>(); List<String> logMessageInfo = new ArrayList<>();
sb.append("["); sb.append("[");
for (VolumeVO vol : nonDestroyedVols) { for (VolumeVO vol : nonDestroyedVols) {
volInstance = _vmInstanceDao.findById(vol.getInstanceId()); volInstance = _vmInstanceDao.findById(vol.getInstanceId());
if (volInstance != null) {
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid())); logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
} else {
logMessageInfo.add(String.format("Volume [%s]", vol.getUuid()));
}
} }
sb.append(String.join(", ", logMessageInfo)); sb.append(String.join(", ", logMessageInfo));
sb.append("]"); sb.append("]");