Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7C076C79C for ; Sat, 6 Dec 2014 00:28:15 +0000 (UTC) Received: (qmail 15700 invoked by uid 500); 6 Dec 2014 00:28:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 15670 invoked by uid 500); 6 Dec 2014 00:28:15 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 15661 invoked by uid 99); 6 Dec 2014 00:28:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Dec 2014 00:28:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D01BB953650; Sat, 6 Dec 2014 00:28:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/hotfix/CLOUDSTACK-6212 to e1e5e12 Date: Sat, 6 Dec 2014 00:28:14 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/hotfix/CLOUDSTACK-6212 [created] e1e5e12aa 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1e5e12a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1e5e12a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1e5e12a Branch: refs/heads/hotfix/CLOUDSTACK-6212 Commit: e1e5e12aaa649c05f2d5bebe1bdaec00e284dcf0 Parents: 4f748e6 Author: Rohit Yadav Authored: Sat Dec 6 05:54:39 2014 +0530 Committer: Rohit Yadav Committed: Sat Dec 6 05:54:39 2014 +0530 ---------------------------------------------------------------------- setup/db/db/schema-442to450.sql | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1e5e12a/setup/db/db/schema-442to450.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql index d158c51..4469ecc 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