Merge branch 'main' of https://github.com/apache/cloudstack into nas-br-partb

Author: Pearl1594

api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/ChangeSharedFSServiceOfferingCmd.java

@@ -70,7 +70,7 @@ public class ChangeSharedFSServiceOfferingCmd extends BaseAsyncCmd implements Us
             type = CommandType.UUID,
             entityType = ServiceOfferingResponse.class,
             required = true,
-            description = "the offering to use for the shared filesystem vm")
+            description = "the offering to use for the shared filesystem instance")
     private Long serviceOfferingId;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/storage/sharedfs/CreateSharedFSCmd.java

@@ -130,7 +130,7 @@ public class CreateSharedFSCmd extends BaseAsyncCreateCmd implements UserCmd {
             type = CommandType.UUID,
             required = true,
             entityType = ServiceOfferingResponse.class,
-            description = "the service offering to use for the shared filesystem VM hosting the data. The offering should be HA enabled and the cpu count and memory size should be greater than equal to sharedfsvm.min.cpu.count and sharedfsvm.min.ram.size respectively")
+            description = "the service offering to use for the shared filesystem instance hosting the data. The offering should be HA enabled and the cpu count and memory size should be greater than equal to sharedfsvm.min.cpu.count and sharedfsvm.min.ram.size respectively")
     private Long serviceOfferingId;
 
     @Parameter(name = ApiConstants.FILESYSTEM,

api/src/main/java/org/apache/cloudstack/api/response/CapabilitiesResponse.java

@@ -129,11 +129,11 @@ public class CapabilitiesResponse extends BaseResponse {
     private Integer instancesDisksStatsRetentionTime;
 
     @SerializedName(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT)
-    @Param(description = "the min CPU count for the service offering used by the shared filesystem VM", since = "4.20.0")
+    @Param(description = "the min CPU count for the service offering used by the shared filesystem instance", since = "4.20.0")
     private Integer sharedFsVmMinCpuCount;
 
     @SerializedName(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE)
-    @Param(description = "the min Ram size for the service offering used by the shared filesystem VM", since = "4.20.0")
+    @Param(description = "the min Ram size for the service offering used by the shared filesystem instance", since = "4.20.0")
     private Integer sharedFsVmMinRamSize;
 
     public void setSecurityGroupsEnabled(boolean securityGroupsEnabled) {

api/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFS.java

@@ -64,7 +64,7 @@ public interface SharedFS extends ControlledEntity, Identity, InternalIdentity,
             null,
             SharedFSFeatureEnabled.key());
 
-    String SharedFSVmNamePrefix = "fsvm";
+    String SharedFSVmNamePrefix = "sharedfs";
     String SharedFSPath = "/export";
 
     enum FileSystemType {

core/src/main/java/com/cloud/network/HAProxyConfigurator.java

@@ -485,7 +485,7 @@ private List<String> getRulesForPool(final LoadBalancerTO lbTO, final boolean ke
         sb.append("\tbind ").append(publicIP).append(":").append(publicPort);
         result.add(sb.toString());
         sb = new StringBuilder();
-        sb.append("\t").append("balance ").append(algorithm);
+        sb.append("\t").append("balance ").append(algorithm.toLowerCase());
         result.add(sb.toString());
 
         int i = 0;

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

@@ -193,8 +193,8 @@ CREATE TABLE `cloud`.`ip4_guest_subnet_network_map` (
    CONSTRAINT `uc_ip4_guest_subnet_network_map__uuid` UNIQUE (`uuid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-ALTER TABLE `cloud`.`network_offerings` RENAME COLUMN `nsx_mode` TO `network_mode`;
-ALTER TABLE `cloud`.`vpc_offerings` RENAME COLUMN `nsx_mode` TO `network_mode`;
+CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('network_offerings',  'nsx_mode', 'network_mode', 'varchar(32)  COMMENT "mode in which the network would route traffic"');
+CALL `cloud`.`IDEMPOTENT_CHANGE_COLUMN`('vpc_offerings', 'nsx_mode', 'network_mode', 'varchar(32)  COMMENT "mode in which the network would route traffic"');
 ALTER TABLE `cloud`.`event` MODIFY COLUMN `type` varchar(50) NOT NULL;
 
 -- Add tables for AS Numbers and range
@@ -307,204 +307,6 @@ CREATE TABLE `cloud`.`shared_filesystem`(
     INDEX `i_shared_filesystem__domain_id`(`domain_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-DROP VIEW IF EXISTS `cloud`.`user_vm_view`;
-CREATE VIEW `user_vm_view` AS
-SELECT
-    `vm_instance`.`id` AS `id`,
-    `vm_instance`.`name` AS `name`,
-    `user_vm`.`display_name` AS `display_name`,
-    `user_vm`.`user_data` AS `user_data`,
-    `user_vm`.`user_vm_type` AS `user_vm_type`,
-    `account`.`id` AS `account_id`,
-    `account`.`uuid` AS `account_uuid`,
-    `account`.`account_name` AS `account_name`,
-    `account`.`type` AS `account_type`,
-    `domain`.`id` AS `domain_id`,
-    `domain`.`uuid` AS `domain_uuid`,
-    `domain`.`name` AS `domain_name`,
-    `domain`.`path` AS `domain_path`,
-    `projects`.`id` AS `project_id`,
-    `projects`.`uuid` AS `project_uuid`,
-    `projects`.`name` AS `project_name`,
-    `instance_group`.`id` AS `instance_group_id`,
-    `instance_group`.`uuid` AS `instance_group_uuid`,
-    `instance_group`.`name` AS `instance_group_name`,
-    `vm_instance`.`uuid` AS `uuid`,
-    `vm_instance`.`user_id` AS `user_id`,
-    `vm_instance`.`last_host_id` AS `last_host_id`,
-    `vm_instance`.`vm_type` AS `type`,
-    `vm_instance`.`limit_cpu_use` AS `limit_cpu_use`,
-    `vm_instance`.`created` AS `created`,
-    `vm_instance`.`state` AS `state`,
-    `vm_instance`.`update_time` AS `update_time`,
-    `vm_instance`.`removed` AS `removed`,
-    `vm_instance`.`ha_enabled` AS `ha_enabled`,
-    `vm_instance`.`hypervisor_type` AS `hypervisor_type`,
-    `vm_instance`.`instance_name` AS `instance_name`,
-    `vm_instance`.`guest_os_id` AS `guest_os_id`,
-    `vm_instance`.`display_vm` AS `display_vm`,
-    `guest_os`.`uuid` AS `guest_os_uuid`,
-    `vm_instance`.`pod_id` AS `pod_id`,
-    `host_pod_ref`.`uuid` AS `pod_uuid`,
-    `vm_instance`.`private_ip_address` AS `private_ip_address`,
-    `vm_instance`.`private_mac_address` AS `private_mac_address`,
-    `vm_instance`.`vm_type` AS `vm_type`,
-    `data_center`.`id` AS `data_center_id`,
-    `data_center`.`uuid` AS `data_center_uuid`,
-    `data_center`.`name` AS `data_center_name`,
-    `data_center`.`is_security_group_enabled` AS `security_group_enabled`,
-    `data_center`.`networktype` AS `data_center_network_type`,
-    `host`.`id` AS `host_id`,
-    `host`.`uuid` AS `host_uuid`,
-    `host`.`name` AS `host_name`,
-    `host`.`cluster_id` AS `cluster_id`,
-    `host`.`status` AS `host_status`,
-    `host`.`resource_state` AS `host_resource_state`,
-    `vm_template`.`id` AS `template_id`,
-    `vm_template`.`uuid` AS `template_uuid`,
-    `vm_template`.`name` AS `template_name`,
-    `vm_template`.`type` AS `template_type`,
-    `vm_template`.`format` AS `template_format`,
-    `vm_template`.`display_text` AS `template_display_text`,
-    `vm_template`.`enable_password` AS `password_enabled`,
-    `iso`.`id` AS `iso_id`,
-    `iso`.`uuid` AS `iso_uuid`,
-    `iso`.`name` AS `iso_name`,
-    `iso`.`display_text` AS `iso_display_text`,
-    `service_offering`.`id` AS `service_offering_id`,
-    `service_offering`.`uuid` AS `service_offering_uuid`,
-    `disk_offering`.`uuid` AS `disk_offering_uuid`,
-    `disk_offering`.`id` AS `disk_offering_id`,
-    (CASE
-         WHEN ISNULL(`service_offering`.`cpu`) THEN `custom_cpu`.`value`
-         ELSE `service_offering`.`cpu`
-        END) AS `cpu`,
-    (CASE
-         WHEN ISNULL(`service_offering`.`speed`) THEN `custom_speed`.`value`
-         ELSE `service_offering`.`speed`
-        END) AS `speed`,
-    (CASE
-         WHEN ISNULL(`service_offering`.`ram_size`) THEN `custom_ram_size`.`value`
-         ELSE `service_offering`.`ram_size`
-        END) AS `ram_size`,
-    `backup_offering`.`uuid` AS `backup_offering_uuid`,
-    `backup_offering`.`id` AS `backup_offering_id`,
-    `service_offering`.`name` AS `service_offering_name`,
-    `disk_offering`.`name` AS `disk_offering_name`,
-    `backup_offering`.`name` AS `backup_offering_name`,
-    `storage_pool`.`id` AS `pool_id`,
-    `storage_pool`.`uuid` AS `pool_uuid`,
-    `storage_pool`.`pool_type` AS `pool_type`,
-    `volumes`.`id` AS `volume_id`,
-    `volumes`.`uuid` AS `volume_uuid`,
-    `volumes`.`device_id` AS `volume_device_id`,
-    `volumes`.`volume_type` AS `volume_type`,
-    `security_group`.`id` AS `security_group_id`,
-    `security_group`.`uuid` AS `security_group_uuid`,
-    `security_group`.`name` AS `security_group_name`,
-    `security_group`.`description` AS `security_group_description`,
-    `nics`.`id` AS `nic_id`,
-    `nics`.`uuid` AS `nic_uuid`,
-    `nics`.`device_id` AS `nic_device_id`,
-    `nics`.`network_id` AS `network_id`,
-    `nics`.`ip4_address` AS `ip_address`,
-    `nics`.`ip6_address` AS `ip6_address`,
-    `nics`.`ip6_gateway` AS `ip6_gateway`,
-    `nics`.`ip6_cidr` AS `ip6_cidr`,
-    `nics`.`default_nic` AS `is_default_nic`,
-    `nics`.`gateway` AS `gateway`,
-    `nics`.`netmask` AS `netmask`,
-    `nics`.`mac_address` AS `mac_address`,
-    `nics`.`broadcast_uri` AS `broadcast_uri`,
-    `nics`.`isolation_uri` AS `isolation_uri`,
-    `vpc`.`id` AS `vpc_id`,
-    `vpc`.`uuid` AS `vpc_uuid`,
-    `networks`.`uuid` AS `network_uuid`,
-    `networks`.`name` AS `network_name`,
-    `networks`.`traffic_type` AS `traffic_type`,
-    `networks`.`guest_type` AS `guest_type`,
-    `user_ip_address`.`id` AS `public_ip_id`,
-    `user_ip_address`.`uuid` AS `public_ip_uuid`,
-    `user_ip_address`.`public_ip_address` AS `public_ip_address`,
-    `ssh_details`.`value` AS `keypair_names`,
-    `resource_tags`.`id` AS `tag_id`,
-    `resource_tags`.`uuid` AS `tag_uuid`,
-    `resource_tags`.`key` AS `tag_key`,
-    `resource_tags`.`value` AS `tag_value`,
-    `resource_tags`.`domain_id` AS `tag_domain_id`,
-    `domain`.`uuid` AS `tag_domain_uuid`,
-    `domain`.`name` AS `tag_domain_name`,
-    `resource_tags`.`account_id` AS `tag_account_id`,
-    `account`.`account_name` AS `tag_account_name`,
-    `resource_tags`.`resource_id` AS `tag_resource_id`,
-    `resource_tags`.`resource_uuid` AS `tag_resource_uuid`,
-    `resource_tags`.`resource_type` AS `tag_resource_type`,
-    `resource_tags`.`customer` AS `tag_customer`,
-    `async_job`.`id` AS `job_id`,
-    `async_job`.`uuid` AS `job_uuid`,
-    `async_job`.`job_status` AS `job_status`,
-    `async_job`.`account_id` AS `job_account_id`,
-    `affinity_group`.`id` AS `affinity_group_id`,
-    `affinity_group`.`uuid` AS `affinity_group_uuid`,
-    `affinity_group`.`name` AS `affinity_group_name`,
-    `affinity_group`.`description` AS `affinity_group_description`,
-    `autoscale_vmgroups`.`id` AS `autoscale_vmgroup_id`,
-    `autoscale_vmgroups`.`uuid` AS `autoscale_vmgroup_uuid`,
-    `autoscale_vmgroups`.`name` AS `autoscale_vmgroup_name`,
-    `vm_instance`.`dynamically_scalable` AS `dynamically_scalable`,
-    `user_data`.`id` AS `user_data_id`,
-    `user_data`.`uuid` AS `user_data_uuid`,
-    `user_data`.`name` AS `user_data_name`,
-    `user_vm`.`user_data_details` AS `user_data_details`,
-    `vm_template`.`user_data_link_policy` AS `user_data_policy`
-FROM
-    (((((((((((((((((((((((((((((((((((`user_vm`
-        JOIN `vm_instance` ON (((`vm_instance`.`id` = `user_vm`.`id`)
-            AND ISNULL(`vm_instance`.`removed`))))
-        JOIN `account` ON ((`vm_instance`.`account_id` = `account`.`id`)))
-        JOIN `domain` ON ((`vm_instance`.`domain_id` = `domain`.`id`)))
-        LEFT JOIN `guest_os` ON ((`vm_instance`.`guest_os_id` = `guest_os`.`id`)))
-        LEFT JOIN `host_pod_ref` ON ((`vm_instance`.`pod_id` = `host_pod_ref`.`id`)))
-        LEFT JOIN `projects` ON ((`projects`.`project_account_id` = `account`.`id`)))
-        LEFT JOIN `instance_group_vm_map` ON ((`vm_instance`.`id` = `instance_group_vm_map`.`instance_id`)))
-        LEFT JOIN `instance_group` ON ((`instance_group_vm_map`.`group_id` = `instance_group`.`id`)))
-        LEFT JOIN `data_center` ON ((`vm_instance`.`data_center_id` = `data_center`.`id`)))
-        LEFT JOIN `host` ON ((`vm_instance`.`host_id` = `host`.`id`)))
-        LEFT JOIN `vm_template` ON ((`vm_instance`.`vm_template_id` = `vm_template`.`id`)))
-        LEFT JOIN `vm_template` `iso` ON ((`iso`.`id` = `user_vm`.`iso_id`)))
-        LEFT JOIN `volumes` ON ((`vm_instance`.`id` = `volumes`.`instance_id`)))
-        LEFT JOIN `service_offering` ON ((`vm_instance`.`service_offering_id` = `service_offering`.`id`)))
-        LEFT JOIN `disk_offering` `svc_disk_offering` ON ((`volumes`.`disk_offering_id` = `svc_disk_offering`.`id`)))
-        LEFT JOIN `disk_offering` ON ((`volumes`.`disk_offering_id` = `disk_offering`.`id`)))
-        LEFT JOIN `backup_offering` ON ((`vm_instance`.`backup_offering_id` = `backup_offering`.`id`)))
-        LEFT JOIN `storage_pool` ON ((`volumes`.`pool_id` = `storage_pool`.`id`)))
-        LEFT JOIN `security_group_vm_map` ON ((`vm_instance`.`id` = `security_group_vm_map`.`instance_id`)))
-        LEFT JOIN `security_group` ON ((`security_group_vm_map`.`security_group_id` = `security_group`.`id`)))
-        LEFT JOIN `user_data` ON ((`user_data`.`id` = `user_vm`.`user_data_id`)))
-        LEFT JOIN `nics` ON (((`vm_instance`.`id` = `nics`.`instance_id`)
-        AND ISNULL(`nics`.`removed`))))
-        LEFT JOIN `networks` ON ((`nics`.`network_id` = `networks`.`id`)))
-        LEFT JOIN `vpc` ON (((`networks`.`vpc_id` = `vpc`.`id`)
-        AND ISNULL(`vpc`.`removed`))))
-        LEFT JOIN `user_ip_address` FORCE INDEX(`fk_user_ip_address__vm_id`) ON ((`user_ip_address`.`vm_id` = `vm_instance`.`id`)))
-        LEFT JOIN `user_vm_details` `ssh_details` ON (((`ssh_details`.`vm_id` = `vm_instance`.`id`)
-        AND (`ssh_details`.`name` = 'SSH.KeyPairNames'))))
-        LEFT JOIN `resource_tags` ON (((`resource_tags`.`resource_id` = `vm_instance`.`id`)
-        AND (`resource_tags`.`resource_type` = 'UserVm'))))
-        LEFT JOIN `async_job` ON (((`async_job`.`instance_id` = `vm_instance`.`id`)
-        AND (`async_job`.`instance_type` = 'VirtualMachine')
-        AND (`async_job`.`job_status` = 0))))
-        LEFT JOIN `affinity_group_vm_map` ON ((`vm_instance`.`id` = `affinity_group_vm_map`.`instance_id`)))
-        LEFT JOIN `affinity_group` ON ((`affinity_group_vm_map`.`affinity_group_id` = `affinity_group`.`id`)))
-        LEFT JOIN `autoscale_vmgroup_vm_map` ON ((`autoscale_vmgroup_vm_map`.`instance_id` = `vm_instance`.`id`)))
-        LEFT JOIN `autoscale_vmgroups` ON ((`autoscale_vmgroup_vm_map`.`vmgroup_id` = `autoscale_vmgroups`.`id`)))
-        LEFT JOIN `user_vm_details` `custom_cpu` ON (((`custom_cpu`.`vm_id` = `vm_instance`.`id`)
-        AND (`custom_cpu`.`name` = 'CpuNumber'))))
-        LEFT JOIN `user_vm_details` `custom_speed` ON (((`custom_speed`.`vm_id` = `vm_instance`.`id`)
-        AND (`custom_speed`.`name` = 'CpuSpeed'))))
-        LEFT JOIN `user_vm_details` `custom_ram_size` ON (((`custom_ram_size`.`vm_id` = `vm_instance`.`id`)
-        AND (`custom_ram_size`.`name` = 'memory'))));
-
 -- Quota inject tariff result into subsequent ones
 CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.quota_tariff', 'position', 'bigint(20) NOT NULL DEFAULT 1 COMMENT "Position in the execution sequence for tariffs of the same type"');
 

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java

@@ -2511,7 +2511,9 @@ public Answer copyVolumeFromPrimaryToPrimary(CopyCommand cmd) {
 
             destPool = storagePoolMgr.getStoragePool(destPrimaryStore.getPoolType(), destPrimaryStore.getUuid());
             try {
-                if (srcVol.getPassphrase() != null && srcVol.getVolumeType().equals(Volume.Type.ROOT)) {
+                Volume.Type volumeType = srcVol.getVolumeType();
+
+                if (srcVol.getPassphrase() != null && (Volume.Type.ROOT.equals(volumeType) || Volume.Type.DATADISK.equals(volumeType))) {
                     volume.setQemuEncryptFormat(QemuObject.EncryptFormat.LUKS);
                     storagePoolMgr.copyPhysicalDisk(volume, destVolumeName, destPool, cmd.getWaitInMillSeconds(), srcVol.getPassphrase(), destVol.getPassphrase(), srcVol.getProvisioningType());
                 } else {