Skip to content

Commit 03d24ff

Browse files
authored
Fix NPE on primary storage delete (#11817)
1 parent 2a6ce0c commit 03d24ff

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

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

15591559
protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) {
15601560
StringBuilder sb = new StringBuilder();
1561-
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null).stream().filter(vol -> vol.getState() != Volume.State.Destroy).collect(Collectors.toList());
1561+
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null);
15621562
VMInstanceVO volInstance;
15631563
List<String> logMessageInfo = new ArrayList<>();
15641564

15651565
sb.append("[");
15661566
for (VolumeVO vol : nonDestroyedVols) {
15671567
volInstance = _vmInstanceDao.findById(vol.getInstanceId());
1568-
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1568+
if (volInstance != null) {
1569+
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1570+
} else {
1571+
logMessageInfo.add(String.format("Volume [%s]", vol.getUuid()));
1572+
}
15691573
}
15701574
sb.append(String.join(", ", logMessageInfo));
15711575
sb.append("]");

0 commit comments

Comments
 (0)