Handle inactive disk offering edge case

Author: abh1sar

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -875,7 +875,7 @@ public List<DiskOfferingInfo> getDataDiskOfferingListFromBackup(Backup backup) {
                 continue;
             }
             DiskOfferingVO diskOffering = diskOfferingDao.findByUuid(diskOfferingIds[i]);
-            if (diskOffering == null) {
+            if (diskOffering == null || diskOffering.getState().equals(DiskOffering.State.Inactive)) {
                 throw new CloudRuntimeException("Unable to find the disk offering with uuid (" + diskOfferingIds[i] + ") stored in backup. Please specify a valid disk offering id while creating the instance");
             }
             Long size = Long.parseLong(diskSizes[i]) / (1024 * 1024 * 1024);
@@ -951,7 +951,7 @@ public boolean restoreBackupToVM(final Long backupId, final Long vmId) throws Re
                         vm.getId(), ApiCommandResourceType.VirtualMachine.toString(), eventId);
                 throw new CloudRuntimeException(String.format("Error restoring backup [%s] to VM %s.", backupDetailsInMessage));
             }
-        } catch (Exception e) {
+        } catch (CloudRuntimeException e) {
             updateVolumeState(vm, Volume.Event.RestoreFailed, Volume.State.Ready);
             updateVmState(vm, VirtualMachine.Event.RestoringFailed, VirtualMachine.State.Stopped);
             logger.error(String.format("Failed to restore backup [%s] to VM %s due to: [%s].", backupDetailsInMessage, vm.getInstanceName(), e.getMessage()), e);

ui/src/views/compute/wizard/VolumeDiskOfferingSelectView.vue

@@ -33,12 +33,13 @@
           <span>
             <a-select
               @change="updateOfferingSelect($event, record.id)"
-              :defaultValue="record.diskofferingid"
+              :defaultValue="getDefaultDiskOffering(record)"
               showSearch
               optionFilterProp="label"
               :filterOption="(input, option) => {
                 return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }" >
+              }"
+              :style="{ width: '80%' }" >
               <a-select-option v-for="offering in diskOfferings" :key="offering.id" :label="offering.displaytext">
                 {{ offering.displaytext }}
               </a-select-option>
@@ -193,6 +194,9 @@ export default {
       this.setDefaultValues()
       this.loading = false
     },
+    getDefaultDiskOffering (record) {
+      return this.diskOfferings.find(x => x.id === record.diskofferingid)?.id || this.diskOfferings[0]?.id
+    },
     setDefaultValues () {
       this.values = {}
       for (const item of this.items) {