You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/12/08 10:18:22 UTC
[1/2] git commit: updated refs/heads/master to eb66645
Repository: cloudstack
Updated Branches:
refs/heads/master 8f8e31111 -> eb666453f
CLOUDSTACK-6212: Let vm_instance table's ID field be unique and auto_increment
`vm_instance` table's id column is unique but does not auto_increment like other
resource tables. The fix simply alter the table's id column to have it
auto_increment which may avoid id conflicts in a multi-master mysql setup.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit e1e5e12aaa649c05f2d5bebe1bdaec00e284dcf0)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a60d232d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a60d232d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a60d232d
Branch: refs/heads/master
Commit: a60d232d07fb1f3743bdb928db37367d1e5b3f2e
Parents: 8f8e311
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sat Dec 6 05:54:39 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 8 14:47:58 2014 +0530
----------------------------------------------------------------------
setup/db/db/schema-442to450.sql | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a60d232d/setup/db/db/schema-442to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index 6c456c5..72979c8 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -35,6 +35,7 @@ CREATE VIEW `cloud`.`storage_tag_view` AS
ALTER TABLE `cloud`.`volumes` ADD COLUMN `provisioning_type` VARCHAR(32) NOT NULL DEFAULT 'thin' COMMENT 'pre allocation setting of the volume';
ALTER TABLE `cloud`.`disk_offering` ADD COLUMN `provisioning_type` VARCHAR(32) NOT NULL DEFAULT 'thin' COMMENT 'pre allocation setting of the volume';
+ALTER TABLE `cloud`.`vm_instance` MODIFY id bigint unsigned AUTO_INCREMENT UNIQUE NOT NULL;
DROP VIEW IF EXISTS `cloud`.`disk_offering_view`;
CREATE VIEW `cloud`.`disk_offering_view` AS
[2/2] git commit: updated refs/heads/master to eb66645
Posted by bh...@apache.org.
CLOUDSTACK-6212: auto_increment for some other resource tables
This fix alters table columns which are primary keys but don't have them
auto_increment such as region, domain_router, user_vm etc.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit a11ddf307747ef03785c27519fb535a36d4be145)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb666453
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb666453
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb666453
Branch: refs/heads/master
Commit: eb666453f3bd4f9ff06d12fad94bf7a2ca427099
Parents: a60d232
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sat Dec 6 06:26:31 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Dec 8 14:48:04 2014 +0530
----------------------------------------------------------------------
setup/db/db/schema-442to450.sql | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb666453/setup/db/db/schema-442to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index 72979c8..3131842 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -35,7 +35,15 @@ CREATE VIEW `cloud`.`storage_tag_view` AS
ALTER TABLE `cloud`.`volumes` ADD COLUMN `provisioning_type` VARCHAR(32) NOT NULL DEFAULT 'thin' COMMENT 'pre allocation setting of the volume';
ALTER TABLE `cloud`.`disk_offering` ADD COLUMN `provisioning_type` VARCHAR(32) NOT NULL DEFAULT 'thin' COMMENT 'pre allocation setting of the volume';
-ALTER TABLE `cloud`.`vm_instance` MODIFY id bigint unsigned AUTO_INCREMENT UNIQUE NOT NULL;
+
+-- Have primary keys of following table AUTO_INCREMENT
+ALTER TABLE `cloud`.`region` MODIFY `id` int unsigned AUTO_INCREMENT UNIQUE NOT NULL;
+ALTER TABLE `cloud`.`vm_instance` MODIFY `id` bigint unsigned AUTO_INCREMENT UNIQUE NOT NULL;
+ALTER TABLE `cloud`.`user_vm` MODIFY `id` bigint unsigned AUTO_INCREMENT UNIQUE NOT NULL;
+ALTER TABLE `cloud`.`domain_router` MODIFY `id` bigint unsigned AUTO_INCREMENT UNIQUE NOT NULL;
+ALTER TABLE `cloud`.`service_offering` MODIFY `id` bigint unsigned AUTO_INCREMENT NOT NULL;
+ALTER TABLE `cloud`.`load_balancing_rules` MODIFY `id` bigint unsigned AUTO_INCREMENT NOT NULL;
+ALTER TABLE `cloud`.`port_forwarding_rules` MODIFY `id` bigint unsigned AUTO_INCREMENT NOT NULL;
DROP VIEW IF EXISTS `cloud`.`disk_offering_view`;
CREATE VIEW `cloud`.`disk_offering_view` AS