Skip to content

Commit 8cf1034

Browse files
committed
Fix NPE on primary storage delete
1 parent e6c7a71 commit 8cf1034

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
@@ -1792,14 +1792,18 @@ private boolean deleteDataStoreInternal(StoragePoolVO sPool, boolean forced) {
17921792

17931793
protected String getStoragePoolNonDestroyedVolumesLog(long storagePoolId) {
17941794
StringBuilder sb = new StringBuilder();
1795-
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null).stream().filter(vol -> vol.getState() != Volume.State.Destroy).collect(Collectors.toList());
1795+
List<VolumeVO> nonDestroyedVols = volumeDao.findByPoolId(storagePoolId, null);
17961796
VMInstanceVO volInstance;
17971797
List<String> logMessageInfo = new ArrayList<>();
17981798

17991799
sb.append("[");
18001800
for (VolumeVO vol : nonDestroyedVols) {
18011801
volInstance = _vmInstanceDao.findById(vol.getInstanceId());
1802-
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1802+
if (volInstance != null) {
1803+
logMessageInfo.add(String.format("Volume [%s] (attached to VM [%s])", vol.getUuid(), volInstance.getUuid()));
1804+
} else {
1805+
logMessageInfo.add(String.format("Volume [%s]", vol.getUuid()));
1806+
}
18031807
}
18041808
sb.append(String.join(", ", logMessageInfo));
18051809
sb.append("]");

0 commit comments

Comments
 (0)