move db upgrade to 4.17

Author: Daan Hoogland

engine/schema/src/main/resources/META-INF/db/schema-41520to41600.sql

@@ -805,50 +805,3 @@ ALTER TABLE cloud.user_vm_details MODIFY value varchar(5120) NOT NULL;
 ALTER TABLE cloud_usage.usage_network DROP PRIMARY KEY, ADD PRIMARY KEY (`account_id`,`zone_id`,`host_id`,`network_id`,`event_time_millis`);
 ALTER TABLE `cloud`.`user_statistics` DROP INDEX `account_id`, ADD UNIQUE KEY `account_id`  (`account_id`,`data_center_id`,`public_ip_address`,`device_id`,`device_type`, `network_id`);
 ALTER TABLE `cloud_usage`.`user_statistics` DROP INDEX `account_id`, ADD UNIQUE KEY `account_id`  (`account_id`,`data_center_id`,`public_ip_address`,`device_id`,`device_type`, `network_id`);
-
--- Management Server Status
-ALTER TABLE cloud.mshost ADD CONSTRAINT mshost_UUID UNIQUE KEY (uuid);
-CREATE TABLE `mshost_status` (
-  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
-  `ms_id` varchar(40) DEFAULT NULL COMMENT 'the uuid of the management server record',
-  `last_start` datetime DEFAULT NULL COMMENT 'the last start time for this MS',
-  `last_stop` datetime DEFAULT NULL COMMENT 'the last stop time for this MS',
-  `last_boot` datetime DEFAULT NULL COMMENT 'the last system boot time for the host of this MS',
-  `last_down` datetime DEFAULT NULL COMMENT 'the last system shutdown time for the host of this MS',
-  `os_distribution` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'the name of the os type running on the host of this MS',
-  `java_name` varchar(64) DEFAULT NULL COMMENT 'the name of the java distribution running this MS',
-  `java_version` varchar(64) DEFAULT NULL COMMENT 'the version of the java distribution running this MS',
-  `updated` datetime DEFAULT NULL,
-  `created` datetime DEFAULT NULL,
-  `removed` datetime DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  CONSTRAINT `uc_ms_id` UNIQUE (`ms_id`),
-  CONSTRAINT `mshost_status_FK` FOREIGN KEY (`ms_id`) REFERENCES `mshost` (`uuid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3;
-
-DROP VIEW IF EXISTS `cloud`.`mshost_view`;
-CREATE VIEW `cloud`.`mshost_view` AS
-select
-    `cloud`.`mshost`.`id` AS `id`,
-    `cloud`.`mshost`.`msid` AS `msid`,
-    `cloud`.`mshost`.`runid` AS `runid`,
-    `cloud`.`mshost`.`name` AS `name`,
-    `cloud`.`mshost`.`uuid` AS `uuid`,
-    `cloud`.`mshost`.`state` AS `state`,
-    `cloud`.`mshost`.`version` AS `version`,
-    `cloud`.`mshost`.`service_ip` AS `service_ip`,
-    `cloud`.`mshost`.`service_port` AS `service_port`,
-    `cloud`.`mshost`.`last_update` AS `last_update`,
-    `cloud`.`mshost`.`removed` AS `removed`,
-    `cloud`.`mshost`.`alert_count` AS `alert_count`,
-    `cloud`.`mshost_status`.`last_start` AS `last_start`,
-    `cloud`.`mshost_status`.`last_stop` AS `last_stop`,
-    `cloud`.`mshost_status`.`last_boot` AS `last_boot`,
-    `cloud`.`mshost_status`.`last_down` AS `last_down`,
-    `cloud`.`mshost_status`.`os_distribution` AS `os_distribution`,
-    `cloud`.`mshost_status`.`java_name` AS `java_name`,
-    `cloud`.`mshost_status`.`java_version` AS `java_version`
-from
-    (`cloud`.`mshost`
-left join `cloud`.`mshost_status` on
-    ((`cloud`.`mshost`.`uuid` = `cloud`.`mshost_status`.`ms_id`)))

engine/schema/src/main/resources/META-INF/db/schema-41610to41700.sql

@@ -17,4 +17,52 @@
 
 --;
 -- Schema upgrade from 4.16.1.0 to 4.17.0.0
---;
+--;
+
+
+-- Management Server Status
+ALTER TABLE `cloud`.`mshost` ADD CONSTRAINT `mshost_UUID` UNIQUE KEY (`uuid`);
+CREATE TABLE `cloud`.`mshost_status` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `ms_id` varchar(40) DEFAULT NULL COMMENT 'the uuid of the management server record',
+  `last_start` datetime DEFAULT NULL COMMENT 'the last start time for this MS',
+  `last_stop` datetime DEFAULT NULL COMMENT 'the last stop time for this MS',
+  `last_boot` datetime DEFAULT NULL COMMENT 'the last system boot time for the host of this MS',
+  `last_down` datetime DEFAULT NULL COMMENT 'the last system shutdown time for the host of this MS',
+  `os_distribution` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT 'the name of the os type running on the host of this MS',
+  `java_name` varchar(64) DEFAULT NULL COMMENT 'the name of the java distribution running this MS',
+  `java_version` varchar(64) DEFAULT NULL COMMENT 'the version of the java distribution running this MS',
+  `updated` datetime DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  `removed` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  CONSTRAINT `uc_ms_id` UNIQUE (`ms_id`),
+  CONSTRAINT `mshost_status_FK` FOREIGN KEY (`ms_id`) REFERENCES `mshost` (`uuid`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3;
+
+DROP VIEW IF EXISTS `cloud`.`mshost_view`;
+CREATE VIEW `cloud`.`mshost_view` AS
+select
+    `cloud`.`mshost`.`id` AS `id`,
+    `cloud`.`mshost`.`msid` AS `msid`,
+    `cloud`.`mshost`.`runid` AS `runid`,
+    `cloud`.`mshost`.`name` AS `name`,
+    `cloud`.`mshost`.`uuid` AS `uuid`,
+    `cloud`.`mshost`.`state` AS `state`,
+    `cloud`.`mshost`.`version` AS `version`,
+    `cloud`.`mshost`.`service_ip` AS `service_ip`,
+    `cloud`.`mshost`.`service_port` AS `service_port`,
+    `cloud`.`mshost`.`last_update` AS `last_update`,
+    `cloud`.`mshost`.`removed` AS `removed`,
+    `cloud`.`mshost`.`alert_count` AS `alert_count`,
+    `cloud`.`mshost_status`.`last_start` AS `last_start`,
+    `cloud`.`mshost_status`.`last_stop` AS `last_stop`,
+    `cloud`.`mshost_status`.`last_boot` AS `last_boot`,
+    `cloud`.`mshost_status`.`last_down` AS `last_down`,
+    `cloud`.`mshost_status`.`os_distribution` AS `os_distribution`,
+    `cloud`.`mshost_status`.`java_name` AS `java_name`,
+    `cloud`.`mshost_status`.`java_version` AS `java_version`
+from
+    (`cloud`.`mshost`
+left join `cloud`.`mshost_status` on
+    ((`cloud`.`mshost`.`uuid` = `cloud`.`mshost_status`.`ms_id`)));