Skip to content

Commit 1954a96

Browse files
hsato03Locharla, Sandeep
authored andcommitted
Fix NPE on primary storage delete (apache#11817)
1 parent f82ccc0 commit 1954a96

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,14 +1801,18 @@ private boolean deleteDataStoreInternal(StoragePoolVO sPool, boolean forced) {
18011801

18021802
protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) {
18031803
StringBuilder sb = new StringBuilder();
1804-
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null).stream().filter(vol -> vol.getState() != Volume.State.Destroy).collect(Collectors.toList());
1804+
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null);
18051805
VMInstanceVO volInstance;
18061806
List<String> logMessageInfo = new ArrayList<>();
18071807

18081808
sb.append("[");
18091809
for (VolumeVO vol : nonDestroyedVols) {
18101810
volInstance = _vmInstanceDao.findById(vol.getInstanceId());
1811-
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1811+
if (volInstance != null) {
1812+
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1813+
} else {
1814+
logMessageInfo.add(String.format("Volume [%s]", vol.getUuid()));
1815+
}
18121816
}
18131817
sb.append(String.join(", ", logMessageInfo));
18141818
sb.append("]");

0 commit comments

Comments
 (0)