From Eli Mesika <emesika@redhat.com>:
Eli Mesika has submitted this change and it was merged. Change subject: core: Squash 03_06 upgrade scripts into base db ...................................................................... core: Squash 03_06 upgrade scripts into base db core: Squash 03_06 upgrade scripts into base db This patch introduces all changes made in dbscripts/upgrade/03_06* scripts into the base database. The process of squashing is : 1) creating a git branch with only the squashed version upgrade scripts 2) generating schema and insert files (automatically by pg_dump) 3) restoring all deleted upgrade files with version > squashed version that were deleted in 1) 4) creating a database based on 1) to 3) 5) creating a database on master 6) using the database comparison tool to verify both databases are identical (except some generated UUIDs Change-Id: Ia34cf8764c6420c8c7fd5662bde587765c33818b Signed-off-by: emesika <emesika@redhat.com> --- M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterServiceDaoTest.java M packaging/dbscripts/create_tables.sql M packaging/dbscripts/data/00000_insert_schema_version.sql M packaging/dbscripts/data/00200_insert_ad_groups.sql A packaging/dbscripts/data/00210_insert_mac_pools.sql A packaging/dbscripts/data/00220_insert_mac_pool_ranges.sql M packaging/dbscripts/data/00300_insert_storage_pool.sql M packaging/dbscripts/data/00340_insert_policy_units.sql M packaging/dbscripts/data/00350_insert_cluster_policies.sql M packaging/dbscripts/data/00360_insert_cluster_policy_units.sql M packaging/dbscripts/data/00400_insert_vds_groups.sql M packaging/dbscripts/data/00500_insert_roles.sql M packaging/dbscripts/data/00600_insert_permissions.sql M packaging/dbscripts/data/00700_insert_roles_groups.sql M packaging/dbscripts/data/00800_insert_images.sql M packaging/dbscripts/data/00900_insert_network.sql M packaging/dbscripts/data/01000_insert_network_cluster.sql M packaging/dbscripts/data/01100_insert_vm_static.sql M packaging/dbscripts/data/01200_insert_vm_device.sql M packaging/dbscripts/data/01300_insert_vm_ovf_generations.sql M packaging/dbscripts/data/01400_insert_action_version_map.sql M packaging/dbscripts/data/01500_insert_event_map.sql M packaging/dbscripts/data/01600_insert_dwh_history_timekeeping.sql M packaging/dbscripts/data/01700_insert_gluster_service_types.sql M packaging/dbscripts/data/01800_insert_gluster_services.sql M packaging/dbscripts/data/01900_insert_vnic_profiles.sql D packaging/dbscripts/data/02000_insert_vm_init.sql A packaging/dbscripts/data/02100_insert_cpu_profiles.sql A packaging/dbscripts/data/02600_insert_cluster_features.sql R packaging/dbscripts/data/02700_insert_gluster_config_master.sql M packaging/dbscripts/dbfunc-common.sh D packaging/dbscripts/upgrade/03_06_0010_update_haswell_vds_to_new_name.sql D packaging/dbscripts/upgrade/03_06_0020_add_job_step_ids_to_command_entities.sql D packaging/dbscripts/upgrade/03_06_0030_set_name_for_internal_user.sql D packaging/dbscripts/upgrade/03_06_0040_modify_default_value_of_numa_tune_mode.sql D packaging/dbscripts/upgrade/03_06_0050_update_blank_template_origin_type.sql D packaging/dbscripts/upgrade/03_06_0060_add_executed_to_command_entities.sql D packaging/dbscripts/upgrade/03_06_0070_update_sgio_for_readonly_disks.sql D packaging/dbscripts/upgrade/03_06_0080_reset_rng_sources.sql D packaging/dbscripts/upgrade/03_06_0090_add_mac_pool_ranges_to_storage_pool.sql D packaging/dbscripts/upgrade/03_06_0100_add_provider_host_id_vdsstatic.sql D packaging/dbscripts/upgrade/03_06_0110_add_permissions_to_mac_pools.sql D packaging/dbscripts/upgrade/03_06_0120_skip_fencing_when_sd_is_alive.sql D packaging/dbscripts/upgrade/03_06_0130_add_live_merge_supported.sql D packaging/dbscripts/upgrade/03_06_0140_rename_async_tasks_columns.sql D packaging/dbscripts/upgrade/03_06_0150_clear_address_for_unplugged_disks.sql D packaging/dbscripts/upgrade/03_06_0160_add_dwh_hostname_and_uuid.sql D packaging/dbscripts/upgrade/03_06_0170_add_qos_table.sql D packaging/dbscripts/upgrade/03_06_0180_add_disk_profiles_table.sql D packaging/dbscripts/upgrade/03_06_0190_add_disk_profile_action_groups.sql D packaging/dbscripts/upgrade/03_06_0200_remove_active_column_from_groups.sql D packaging/dbscripts/upgrade/03_06_0210_skip_fencing_when_connectivity_broken.sql D packaging/dbscripts/upgrade/03_06_0220_add_history_data_to_vm_statistics.sql D packaging/dbscripts/upgrade/03_06_0230_disable_fencing_in_cluster.sql D packaging/dbscripts/upgrade/03_06_0240_update_disk_bootable_shareable.sql D packaging/dbscripts/upgrade/03_06_0250_disk_profile_for_disk_image.sql D packaging/dbscripts/upgrade/03_06_0260_remove_external_network_labels.sql D packaging/dbscripts/upgrade/03_06_0270_convert_cow_preallocated_to_cow_sparse.sql D packaging/dbscripts/upgrade/03_06_0280_add_cpu_limit_to_qos_table.sql D packaging/dbscripts/upgrade/03_06_0290_add_cpu_profiles_table.sql D packaging/dbscripts/upgrade/03_06_0300_add_cpu_profile_id_to_vm_static.sql D packaging/dbscripts/upgrade/03_06_0310_change_virtio_serial_to_managed_device.sql D packaging/dbscripts/upgrade/03_06_0320_remove_blank_template_cpu_profile.sql D packaging/dbscripts/upgrade/03_06_0330_refactor_network_qos.sql D packaging/dbscripts/upgrade/03_06_0340_add_vds_activate_manual_ha_to_event_map.sql D packaging/dbscripts/upgrade/03_06_0350_async_tasks_add_root_command_id.sql D packaging/dbscripts/upgrade/03_06_0360_remove_install_vds_upgrade_ovirt_node_action_group.sql D packaging/dbscripts/upgrade/03_06_0370_gluster_georep_tables.sql D packaging/dbscripts/upgrade/03_06_0380_set_time_drift_validation.sql D packaging/dbscripts/upgrade/03_06_0390_add_logical_name_to_vm_device.sql D packaging/dbscripts/upgrade/03_06_0400_clear_numa_node_distance.sql D packaging/dbscripts/upgrade/03_06_0410_move_cpu_over_commit_to_vds_stats.sql D packaging/dbscripts/upgrade/03_06_0420_set_interleave_default_value_for_numa_tune_mode.sql D packaging/dbscripts/upgrade/03_06_0430_add_migrate_to_server_failed_event.sql D packaging/dbscripts/upgrade/03_06_0440_create_index_on_images.sql D packaging/dbscripts/upgrade/03_06_0450_create_index_on_vm_device.sql D packaging/dbscripts/upgrade/03_06_0460_remove_vm_init_for_blank_template.sql D packaging/dbscripts/upgrade/03_06_0470_medium_instance_type_has_two_cpus.sql D packaging/dbscripts/upgrade/03_06_0480_add_idx_gluster_georep_slavevolname.sql D packaging/dbscripts/upgrade/03_06_0490_create_default_disk_profiles.sql D packaging/dbscripts/upgrade/03_06_0500_add_user_id_to_async_tasks.sql D packaging/dbscripts/upgrade/03_06_0510_add_online_cpu_list.sql D packaging/dbscripts/upgrade/03_06_0520_add_vm_auto_convergence.sql D packaging/dbscripts/upgrade/03_06_0530_add_foreign_keys_to_async_tasks_table.sql D packaging/dbscripts/upgrade/03_06_0540_add_cluster_parameters_override_to_vm.sql D packaging/dbscripts/upgrade/03_06_0550_add_cluster_parameters_override_policy_unit.sql D packaging/dbscripts/upgrade/03_06_0560_add_host_network_qos_columns.sql D packaging/dbscripts/upgrade/03_06_0570_revert_async_tasks_fk.sql D packaging/dbscripts/upgrade/03_06_0580_insert_granular_vm_roles.sql D packaging/dbscripts/upgrade/03_06_0590_add_graphics_info_columns.sql D packaging/dbscripts/upgrade/03_06_0600_fix_external_events_role_groups.sql D packaging/dbscripts/upgrade/03_06_0610_fix_admin_internal_constant_sync.sql D packaging/dbscripts/upgrade/03_06_0620_create_fence_agents_table.sql D packaging/dbscripts/upgrade/03_06_0630_add_wipe_after_delete_to_storage_domain_static.sql D packaging/dbscripts/upgrade/03_06_0640_add_migration_policy_unit.sql D packaging/dbscripts/upgrade/03_06_0650_add_authentication_url.sql D packaging/dbscripts/upgrade/03_06_0660_add_index_image_storage_domain_map.sql D packaging/dbscripts/upgrade/03_06_0670_add_engine_sessions.sql D packaging/dbscripts/upgrade/03_06_0680_remove_groups_roles_from_users.sql D packaging/dbscripts/upgrade/03_06_0690_render_event_map_optional.sql D packaging/dbscripts/upgrade/03_06_0700_move_hibernation_volumes_to_active_snapshots.sql D packaging/dbscripts/upgrade/03_06_0710_remove_deprecated_display_columns.sql D packaging/dbscripts/upgrade/03_06_0720_adjust_default_display_type.sql D packaging/dbscripts/upgrade/03_06_0730_adjust_blank_template_video_card.sql D packaging/dbscripts/upgrade/03_06_0740_add_guest_agent_status_to_vm_dynamic.sql D packaging/dbscripts/upgrade/03_06_0750_attach_disk_profile_permission.sql D packaging/dbscripts/upgrade/03_06_0760_add_gluster_volume_snapshot_tables.sql D packaging/dbscripts/upgrade/03_06_0770_add_vm_run_time_permissions.sql D packaging/dbscripts/upgrade/03_06_0780_qos_name_uniqueness.sql D packaging/dbscripts/upgrade/03_06_0790_change_prepare_to_hibernate_to_up.sql D packaging/dbscripts/upgrade/03_06_0800_add_LSM_action_group_id.sql D packaging/dbscripts/upgrade/03_06_0810_insert_quartz_tables.sql D packaging/dbscripts/upgrade/03_06_0820_add_snapshot_count_to_gluster_volume.sql D packaging/dbscripts/upgrade/03_06_0830_add_host_device_table.sql D packaging/dbscripts/upgrade/03_06_0840_add_management_to_network_cluster.sql D packaging/dbscripts/upgrade/03_06_0850_update_management_network_vdc_option.sql D packaging/dbscripts/upgrade/03_06_0860_add_total_rx_tx_statistics.sql D packaging/dbscripts/upgrade/03_06_0870_add_gluster_volume_snapshot_schedule_tables.sql D packaging/dbscripts/upgrade/03_06_0880_add_snapshot_scheduled_flag_to_gluster_volume.sql D packaging/dbscripts/upgrade/03_06_0890_add_user_id_to_command_entities.sql D packaging/dbscripts/upgrade/03_06_0900_add_gluster_config_master_table.sql D packaging/dbscripts/upgrade/03_06_0920_gluster_geo_rep_alter_config_value_column.sql D packaging/dbscripts/upgrade/03_06_0930_add_delete_contraint_vm_interface_statistics.sql D packaging/dbscripts/upgrade/03_06_0940_drop_vm_dynamic_guest_last_logxxx_time_columns.sql D packaging/dbscripts/upgrade/03_06_0950_add_idx_gluster_georep_slavehostname.sql D packaging/dbscripts/upgrade/03_06_0960_add_storage_device_tables.sql D packaging/dbscripts/upgrade/03_06_0970_add_maintenance_reason_to_vds_dynamic.sql D packaging/dbscripts/upgrade/03_06_0980_add_maintenance_reason_required_to_vds_groups.sql D packaging/dbscripts/upgrade/03_06_0990_georep_drop_constraint_config_key.sql D packaging/dbscripts/upgrade/03_06_1000_add_disperse_and_redundancy_count_to_gluster_volume.sql D packaging/dbscripts/upgrade/03_06_1010_add_in_out_migrations.sql D packaging/dbscripts/upgrade/03_06_1020_add_vm_dynamic_guest_mem_cached_buffered.sql D packaging/dbscripts/upgrade/03_06_1030_change_options_to_text.sql D packaging/dbscripts/upgrade/03_06_1040_add_gluster_to_network_cluster.sql D packaging/dbscripts/upgrade/03_06_1050_add_network_gluster_bricks.sql D packaging/dbscripts/upgrade/03_06_1060_add_alternateprobed_gluster_server.sql D packaging/dbscripts/upgrade/03_06_1070_add_iface_column_to_host_device_table.sql D packaging/dbscripts/upgrade/03_06_1080_add_passthrough_to_vnic_profiles.sql D packaging/dbscripts/upgrade/03_06_1090_decouple_blank_from_cluster.sql D packaging/dbscripts/upgrade/03_06_1100_add_host_nic_vfs_config_table.sql D packaging/dbscripts/upgrade/03_06_1110_add_vfs_config_networks_and_labels_tables.sql D packaging/dbscripts/upgrade/03_06_1120_add_creation_date_to_permissions.sql D packaging/dbscripts/upgrade/03_06_1130_add_disk_storage_type_column_to_base_disks.sql D packaging/dbscripts/upgrade/03_06_1140_add_cinder_volume_type_column_to_base_disks.sql D packaging/dbscripts/upgrade/03_06_1150_change_supported_emulated_machines_to_text.sql D packaging/dbscripts/upgrade/03_06_1160_rename_blank_to_default.sql D packaging/dbscripts/upgrade/03_06_1170_add_username_column_to_georep_session.sql D packaging/dbscripts/upgrade/03_06_1180_add_user_profiles.sql D packaging/dbscripts/upgrade/03_06_1190_update_repo_file_metadata_size.sql D packaging/dbscripts/upgrade/03_06_1200_set_third_party_storage_size_to_NA.sql D packaging/dbscripts/upgrade/03_06_1210_add_vm_host_device_commands.sql D packaging/dbscripts/upgrade/03_06_1220_change_lengthy_varchar_to_text_in_storage_device_table.sql D packaging/dbscripts/upgrade/03_06_1230_add_backup_awareness.sql D packaging/dbscripts/upgrade/03_06_1240_revert_03061210_add_vm_host_device_commands.sql D packaging/dbscripts/upgrade/03_06_1250_add_is_brick_flag-to_storage_device_table.sql D packaging/dbscripts/upgrade/03_06_1260_add_tuned_profile_column_to_vds_groups.sql D packaging/dbscripts/upgrade/03_06_1270_add_uses_scsi_reservation.sql D packaging/dbscripts/upgrade/03_06_1280_fix_constraint_gluster_brick_network.sql D packaging/dbscripts/upgrade/03_06_1290_add_index_on_status_to_vds_dynamic.sql D packaging/dbscripts/upgrade/03_06_1300_again_add_vm_host_device_commands.sql D packaging/dbscripts/upgrade/03_06_1310_add_vm_icons_vm_icon_defaults_tables.sql D packaging/dbscripts/upgrade/03_06_1320_attach_edit_userprofile_permission.sql D packaging/dbscripts/upgrade/03_06_1330_backup_extensions.sql D packaging/dbscripts/upgrade/03_06_1340_change_vm_device_column_length.sql D packaging/dbscripts/upgrade/03_06_1350_add_cmd_associated_entities_table.sql D packaging/dbscripts/upgrade/03_06_1360_add_updates_available_to_vds_dynamic.sql D packaging/dbscripts/upgrade/03_06_1370_add_thresholds_to_storage_domain_static.sql D packaging/dbscripts/upgrade/03_06_1380_index_audit_log_by_gluster_volume_id.sql D packaging/dbscripts/upgrade/03_06_1390_add_cluster_features_table.sql D packaging/dbscripts/upgrade/03_06_1400_add_provider_id_to_vms.sql D packaging/dbscripts/upgrade/03_06_1410_alter_georep_session_details.sql D packaging/dbscripts/upgrade/03_06_1420_add_memory_balancing_vars.sql D packaging/dbscripts/upgrade/03_06_1430_add_num_of_io_threads_to_vm_static.sql D packaging/dbscripts/upgrade/03_06_1440_fix_bool_fence_agents_options.sql D packaging/dbscripts/upgrade/03_06_1450_add_vm_static_console_disconnect_action.sql D packaging/dbscripts/upgrade/03_06_1460_add_network_attachment.sql D packaging/dbscripts/upgrade/03_06_1470_vmdynamic_add_timezone_and_guestosinfo.sql D packaging/dbscripts/upgrade/03_06_1480_change_guest_mem_free_to_bigint.sql D packaging/dbscripts/upgrade/03_06_1490_update_lastSync_in_dwh_history_timekeeping.sql D packaging/dbscripts/upgrade/03_06_1500_add_column_volume_classification.sql D packaging/dbscripts/upgrade/03_06_1510_add_host_external_status.sql D packaging/dbscripts/upgrade/03_06_1520_add_brickInfo_audit_log_table.sql D packaging/dbscripts/upgrade/03_06_1530_add_host_passthrough_flag.sql D packaging/dbscripts/upgrade/03_06_1540_libvirt_secrets.sql D packaging/dbscripts/upgrade/03_06_1550_insert_and_update_config_description.sql D packaging/dbscripts/upgrade/03_06_1560_add_spec_param_to_console_devices.sql D packaging/dbscripts/upgrade/03_06_1570_add_sd_external_status.sql D packaging/dbscripts/upgrade/03_06_1580_add_gluster_cli_based_snapshot_scheduled_column_to_vds_groups.sql D packaging/dbscripts/upgrade/03_06_1590_add_host_device_policy_unit.sql D packaging/dbscripts/upgrade/03_06_1600_add_ksm_with_numa_awareness.sql D packaging/dbscripts/upgrade/03_06_1610_unique_vds_id_name_vds_interface.sql D packaging/dbscripts/upgrade/03_06_1620_add_domain_import_export_permissions_for_admins.sql D packaging/dbscripts/upgrade/03_06_1630_update_config_option.sql D packaging/dbscripts/upgrade/03_06_1640_change_storage_connections_user_name_type.sql D packaging/dbscripts/upgrade/03_06_1650_add_additional_properties_to_providers.sql D packaging/dbscripts/upgrade/03_06_1660_multiple_preferred_hosts_as_text.sql D packaging/dbscripts/upgrade/03_06_1670_unique_vds_id_network_name_vds_interface.sql D packaging/dbscripts/upgrade/03_06_1680_do_not_reference_network_boot_protocol_enum_with_numbers.sql D packaging/dbscripts/upgrade/03_06_1690_add_librbd1_version_to_vds_dynamic.sql D packaging/dbscripts/upgrade/03_06_1700_reintoduce_async_tasks_fk.sql D packaging/dbscripts/upgrade/03_06_1710_add_login_export_import_admin.sql D packaging/dbscripts/upgrade/03_06_1720_vm_pools_add_is_being_destroyed.sql D packaging/dbscripts/upgrade/03_06_1730_rename_vdcfault_to_enginefault.sql D packaging/dbscripts/upgrade/03_06_1740_revert_async_tasks_fk.sql D packaging/dbscripts/upgrade/03_06_1750_pinning_to_multiple_hosts_connection_table.sql D packaging/dbscripts/upgrade/03_06_1760_host_sshfingerprint.sql D packaging/dbscripts/upgrade/03_06_1770_change_vds_dynamic_hooks_to_text.sql D packaging/dbscripts/upgrade/03_06_1780_create_storage_server_connection_extension_table.sql D packaging/dbscripts/upgrade/03_06_1790_add_vm_auto_login_column_to_user_profiles_table.sql D packaging/dbscripts/upgrade/03_06_1800_add_glusterfs_cli_version_to_vds_dynamic.sql D packaging/dbscripts/upgrade/03_06_1810_add_ssh_public_key_id_to_user_profiles_table.sql D packaging/dbscripts/upgrade/03_06_1820_remove_power8e_cpu_type.sql D packaging/dbscripts/upgrade/03_06_1830_fix_display_type_numbers.sql D packaging/dbscripts/upgrade/03_06_1840_add_configure_mac_pool_role_to_data_center_admin.sql D packaging/dbscripts/upgrade/03_06_1850_remove_deprecated_vdc_options.sql D packaging/dbscripts/upgrade/03_06_1860_remove_custom_properties_from_vds_interface.sql D packaging/dbscripts/upgrade/03_06_1870_add_type_spec_param_to_console_devices.sql D packaging/dbscripts/upgrade/03_06_1880_delete_deprecated_config_values.sql D packaging/dbscripts/upgrade/03_06_1890_add_connect_to_serial_console_action_group.sql D packaging/dbscripts/upgrade/03_06_1900_add_index_to_fk_columns.sql D packaging/dbscripts/upgrade/03_06_1910_bump_cluster_machine_type_to_72.sql D packaging/dbscripts/upgrade/03_06_1920_add_cmd_entity_parent_command_id.sql R packaging/dbscripts/upgrade/04_00_0000_set_version.sql R packaging/dbscripts/upgrade/04_00_0001_index_base_disks.sql M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 225 files changed, 2,833 insertions(+), 2,697 deletions(-) Approvals: Martin Peřina: Looks good to me, but someone else must approve Eli Mesika: Verified; Passed CI tests Allon Mureinik: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/74382 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia34cf8764c6420c8c7fd5662bde587765c33818b Gerrit-PatchSet: 8 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>