Merge remote-tracking branch 'apache/main' into refactor-isrootadmin

Author: shwstppr

engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql

@@ -55,7 +55,7 @@ UPDATE `cloud`.`service_offering` SET ram_size = 512 WHERE unique_name IN ("Clou
                                                        AND system_use = 1 AND ram_size < 512;
 
 -- NSX Plugin --
-CREATE TABLE `cloud`.`nsx_providers` (
+CREATE TABLE IF NOT EXISTS `cloud`.`nsx_providers` (
                                          `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
                                          `uuid` varchar(40),
                                          `zone_id` bigint unsigned NOT NULL COMMENT 'Zone ID',

plugins/storage/image/swift/src/main/java/org/apache/cloudstack/storage/datastore/driver/SwiftImageStoreDriverImpl.java

@@ -24,9 +24,6 @@
 
 import javax.inject.Inject;
 
-import com.cloud.configuration.Config;
-import com.cloud.utils.SwiftUtil;
-
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
@@ -42,7 +39,6 @@
 import org.apache.cloudstack.storage.image.BaseImageStoreDriverImpl;
 import org.apache.cloudstack.storage.image.store.ImageStoreImpl;
 import org.apache.cloudstack.storage.to.TemplateObjectTO;
-import org.apache.log4j.Logger;
 
 import com.cloud.agent.api.storage.DownloadAnswer;
 import com.cloud.agent.api.to.DataObjectType;

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

@@ -1283,17 +1283,6 @@ public boolean restoreBackupToVM(final Long backupId, final Long vmId) throws Re
             throw new CloudRuntimeException("Unable to create Instance from backup as the backup has a different number of disks than the Instance");
         }
 
-        int index = 0;
-        for (VolumeVO vmVolume: vmVolumes) {
-            Backup.VolumeInfo backupVolume = backupVolumes.get(index);
-            if (vmVolume.getSize() < backupVolume.getSize()) {
-                throw new CloudRuntimeException(String.format(
-                    "Instance volume size %d[GiB] for volume (%s) is less than the backed-up volume size %d[GiB] for backed-up volume (%s).",
-                    vmVolume.getSize(), vmVolume.getUuid(), backupVolume.getSize(), backupVolume.getUuid()));
-            }
-            index++;
-        }
-
         BackupOffering offering = backupOfferingDao.findByIdIncludingRemoved(backup.getBackupOfferingId());
         if (offering == null) {
             throw new CloudRuntimeException("Failed to find backup offering");