From 603de56c936dc0f841ecaa8418c29c772a8a8345 Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 3 Aug 2011 10:39:02 -0700 Subject: [PATCH] Merged fixes for 228-229 upgrade from 2.2.8 zucchini branch --- .../cloud/upgrade/dao/Upgrade228to229.java | 48 ++++++++++++++++++- setup/db/db/schema-228to229.sql | 46 ++++++++++++++---- setup/db/db/schema-229to2210.sql | 2 +- 3 files changed, 86 insertions(+), 10 deletions(-) diff --git a/server/src/com/cloud/upgrade/dao/Upgrade228to229.java b/server/src/com/cloud/upgrade/dao/Upgrade228to229.java index df97b079b5e..fa57ad0a9cf 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade228to229.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade228to229.java @@ -19,6 +19,8 @@ package com.cloud.upgrade.dao; import java.io.File; import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -59,6 +61,23 @@ public class Upgrade228to229 implements DbUpgrade { @Override public void performDataMigration(Connection conn) { dropKeysIfExist(conn); + PreparedStatement pstmt; + try { + /*fk_cluster__data_center_id has been wrongly added in previous upgrade(not sure which one), 228to229 upgrade drops it and re-add again*/ + pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`cluster` ADD CONSTRAINT `fk_cluster__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `cloud`.`data_center`(`id`) ON DELETE CASCADE"); + pstmt.executeUpdate(); + + pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__removed`(`removed`)"); + pstmt.executeUpdate(); + + pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`network_tags` ADD CONSTRAINT `fk_network_tags__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE"); + pstmt.executeUpdate(); + + pstmt.close(); + + } catch (SQLException e) { + throw new CloudRuntimeException("Unable to execute cluster update", e); + } } @Override @@ -66,20 +85,47 @@ public class Upgrade228to229 implements DbUpgrade { return null; } + private void dropKeysIfExist(Connection conn) { HashMap> indexes = new HashMap>(); HashMap> foreignKeys = new HashMap>(); //indexes to drop + //for network_offering List keys = new ArrayList(); keys.add("name"); indexes.put("network_offerings", keys); + //for snapshot + keys = new ArrayList(); + keys.add("i_snapshots__removed"); + indexes.put("snapshots", keys); + + //for domain router + keys = new ArrayList(); + keys.add("i_domain_router__public_ip_address"); + indexes.put("domain_router", keys); + + //for user_ip_address + keys = new ArrayList(); + keys.add("i_user_ip_address__public_ip_address"); + indexes.put("user_ip_address", keys); + + //foreign keys to drop - this key would be re-added later keys = new ArrayList(); keys.add("fk_cluster__data_center_id"); foreignKeys.put("cluster", keys); + keys = new ArrayList(); + keys.add("fk_domain_router__public_ip_address"); + foreignKeys.put("domain_router", keys); + + //drop foreign key from network tags table - it would be re-added later + keys = new ArrayList(); + keys.add("fk_network_tags__network_id"); + foreignKeys.put("network_tags", keys); + // drop all foreign keys first s_logger.debug("Dropping keys that don't exist in 2.2.6 version of the DB..."); @@ -93,4 +139,4 @@ public class Upgrade228to229 implements DbUpgrade { } } -} +} \ No newline at end of file diff --git a/setup/db/db/schema-228to229.sql b/setup/db/db/schema-228to229.sql index 8ab72afde20..d2033063be6 100644 --- a/setup/db/db/schema-228to229.sql +++ b/setup/db/db/schema-228to229.sql @@ -2,16 +2,51 @@ -- Schema upgrade from 2.2.8 to 2.2.9; --; -ALTER TABLE `cloud`.`cluster` ADD CONSTRAINT `fk_cluster__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `cloud`.`data_center`(`id`) ON DELETE CASCADE; - INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'NetworkManager', 'network.dns.basiczone.updates', 'all', 'This parameter can take 2 values: all (default) and pod. It defines if DHCP/DNS requests have to be send to all dhcp servers in cloudstack, or only to the one in the same pod'); - ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__pod_id`; ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__data_center_id`; ALTER TABLE `cloud`.`op_host_capacity` DROP FOREIGN KEY `fk_op_host_capacity__cluster_id`; ALTER TABLE `cloud`.`firewall_rules_cidrs` ADD UNIQUE INDEX `unique_rule_cidrs` (`firewall_rule_id`, `source_cidr`); +ALTER TABLE `cloud`.`firewall_rules` ADD INDEX `i_firewall_rules__purpose` (`purpose`); + +ALTER TABLE `cloud`.`cluster` ADD INDEX `i_cluster__removed`(`removed`); +ALTER TABLE `cloud`.`data_center` ADD INDEX `i_data_center__removed`(`removed`); +ALTER TABLE `cloud`.`host_pod_ref` ADD INDEX `i_host_pod_ref__removed`(`removed`); + +ALTER TABLE `cloud`.`mshost` ADD INDEX `i_mshost__removed`(`removed`); +ALTER TABLE `cloud`.`mshost` ADD INDEX `i_mshost__last_update` (`last_update`); + +ALTER TABLE `cloud`.`template_zone_ref` ADD INDEX `i_template_zone_ref__removed`(`removed`); +ALTER TABLE `cloud`.`domain` ADD INDEX `i_domain__removed`(`removed`); +ALTER TABLE `cloud`.`disk_offering` ADD INDEX `i_disk_offering__removed`(`removed`); +ALTER TABLE `cloud`.`storage_pool` ADD INDEX `i_storage_pool__removed`(`removed`); +ALTER TABLE `cloud`.`instance_group` ADD INDEX `i_instance_group__removed`(`removed`); + +ALTER TABLE `cloud`.`sync_queue_item` ADD INDEX `i_sync_queue_item__queue_proc_number`(`queue_proc_number`); +ALTER TABLE `cloud`.`sync_queue_item` ADD INDEX `i_sync_queue_item__queue_proc_msid`(`queue_proc_msid`); +ALTER TABLE `cloud`.`op_nwgrp_work` ADD INDEX `i_op_nwgrp_work__taken`(`taken`); +ALTER TABLE `cloud`.`op_nwgrp_work` ADD INDEX `i_op_nwgrp_work__step`(`step`); +ALTER TABLE `cloud`.`op_nwgrp_work` ADD INDEX `i_op_nwgrp_work__seq_no`(`seq_no`); +ALTER TABLE `cloud`.`volumes` ADD INDEX `i_volumes__state`(`state`); + +ALTER TABLE `cloud`.`op_vm_ruleset_log` ADD INDEX `i_op_vm_ruleset_log__instance_id` (`instance_id`); + +ALTER TABLE `cloud`.`storage_pool_host_ref` ADD CONSTRAINT `fk_storage_pool_host_ref__host_id` FOREIGN KEY `fk_storage_pool_host_ref__host_id`(`host_id`) REFERENCES `host` (`id`) ON DELETE CASCADE; +ALTER TABLE `cloud`.`storage_pool_host_ref` ADD CONSTRAINT `fk_storage_pool_host_ref__pool_id` FOREIGN KEY `fk_storage_pool_host_ref__pool_id`(`pool_id`) REFERENCES `storage_pool`(`id`) ON DELETE CASCADE; + +ALTER TABLE `cloud`.`network_offerings` ADD INDEX `i_network_offerings__system_only` (`system_only`); +ALTER TABLE `cloud`.`resource_count` ADD CONSTRAINT `fk_resource_count__account_id` FOREIGN KEY `fk_resource_count__account_id`(`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE; +ALTER TABLE `cloud`.`resource_count` ADD CONSTRAINT `fk_resource_count__domain_id` FOREIGN KEY `fk_resource_count__domain_id`(`domain_id`) REFERENCES `domain` (`id`) ON DELETE CASCADE; +ALTER TABLE `cloud`.`resource_count` ADD INDEX `i_resource_count__type` (`type`); + +ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__instance`(`instance`); +ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__name` (`name`); +ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__category` (`category`); +ALTER TABLE `cloud`.`configuration` ADD INDEX `i_configuration__component` (`component`); + +ALTER TABLE `cloud`.`port_forwarding_rules` ADD CONSTRAINT `fk_port_forwarding_rules__instance_id` FOREIGN KEY `fk_port_forwarding_rules__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE; INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'management-server', 'agent.load.threshold', '0.70', 'Percentage (as a value between 0 and 1) of connected agents after which agent load balancing will start happening'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.visibility', 'global', 'Load Balancer(haproxy) stats visibilty, it can be global,guest-network,disabled'); @@ -19,8 +54,3 @@ INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-serve INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.auth','admin1:AdMiN123','Load Balancer(haproxy) authetication string in the format username:password'); INSERT IGNORE INTO configuration VALUES ('Network', 'DEFAULT', 'management-server', 'network.loadbalancer.haproxy.stats.port','8081','Load Balancer(haproxy) stats port number.'); -<<<<<<< HEAD - -======= -INSERT IGNORE INTO configuration VALUES ('Advanced', 'DEFAULT', 'NetworkManager', 'use.external.dns', 'false', 'Bypass internal dns, use exetrnal dns1 and dns2'); ->>>>>>> e7f32ad... bug 10748: use external dns diff --git a/setup/db/db/schema-229to2210.sql b/setup/db/db/schema-229to2210.sql index 60c34e218a1..0312d7aa14b 100644 --- a/setup/db/db/schema-229to2210.sql +++ b/setup/db/db/schema-229to2210.sql @@ -1,5 +1,5 @@ --; --- Schema upgrade from 2.2.8 to 2.2.9; +-- Schema upgrade from 2.2.9 to 2.2.10; --; ALTER TABLE `cloud`.`account` ADD COLUMN `network_domain` varchar(255);