Skip to content

extract volume: Fix NPE when Volume exists on secondary store but doesn't have a download URL #4530

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

Merged
yadvr merged 1 commit into from
Dec 11, 2020
Merged

extract volume: Fix NPE when Volume exists on secondary store but doesn't have a download URL #4530

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
Fix NPE when Volume exists on secondary store but doesn't have a down… 
…load URL
  • Loading branch information
Pearl Dsilva committed Dec 10, 2020
commit eec438dc9247a66edcbd97f12eaf364e1262f0ea
6 changes: 5 additions & 1 deletion server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2881,8 +2881,12 @@ private Optional<String> setExtractVolumeSearchCriteria(SearchCriteria<VolumeDat
} else if (volumeStoreRef != null) {
s_logger.debug("volume " + volumeId + " is already installed on secondary storage, install path is " +
volumeStoreRef.getInstallPath());
VolumeInfo destVol = volFactory.getVolume(volumeId, DataStoreRole.Image);
if (destVol == null) {
throw new CloudRuntimeException("Failed to find the volume on a secondary store");
}
ImageStoreEntity secStore = (ImageStoreEntity) dataStoreMgr.getDataStore(volumeStoreRef.getDataStoreId(), DataStoreRole.Image);
String extractUrl = secStore.createEntityExtractUrl(volumeStoreRef.getInstallPath(), volume.getFormat(), null);
String extractUrl = secStore.createEntityExtractUrl(volumeStoreRef.getInstallPath(), volume.getFormat(), destVol);
volumeStoreRef = _volumeStoreDao.findByVolume(volumeId);
volumeStoreRef.setExtractUrl(extractUrl);
volumeStoreRef.setExtractUrlCreated(DateUtil.now());
Expand Down