Skip to content

Commit f21d493

Browse files
committed
use backup backed volume param to get backup path
1 parent a626760 commit f21d493

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,11 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, String volumeU
279279
final StoragePoolHostVO dataStore = storagePoolHostDao.findByUuid(dataStoreUuid);
280280
final HostVO hostVO = hostDao.findByIp(hostIp);
281281

282-
Backup.VolumeInfo matchingVolume = getBackedUpVolumeInfo(backupSourceVm.getBackupVolumeList(), volumeUuid);
283-
Long backedUpVolumeSize = matchingVolume.getSize() != null ? matchingVolume.getSize() : 0L;
282+
Backup.VolumeInfo matchingVolume = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
283+
if (matchingVolume == null) {
284+
throw new CloudRuntimeException(String.format("Unable to find volume %s in the list of backed up volumes for backup %s, cannot proceed with restore", volumeUuid, backup));
285+
}
286+
Long backedUpVolumeSize = matchingVolume.getSize();
284287

285288
LOG.debug("Restoring vm volume {} from backup {} on the NAS Backup Provider", volume, backup);
286289
BackupRepository backupRepository = getBackupRepository(backupSourceVm, backup);

0 commit comments

Comments
 (0)