cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 0b9b36c
Date Thu, 29 Aug 2013 21:56:06 GMT
Updated Branches:
  refs/heads/4.2-forward ca0679951 -> 0b9b36cbc


CLOUDSTACK-4561: DeployVm failed after upgrading from earlier version having a private zone
to 4.2

Changes:
- In the upgrade path, for a private zone, entry needs to be added in the affinity_group_domain_map
to provide access to the private zone for the domains it belongs too.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0b9b36cb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0b9b36cb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0b9b36cb

Branch: refs/heads/4.2-forward
Commit: 0b9b36cbca0a4294ccdb3f68ababefc314d9fd8e
Parents: ca06799
Author: Prachi Damle <prachi@cloud.com>
Authored: Thu Aug 29 14:33:36 2013 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Thu Aug 29 14:37:02 2013 -0700

----------------------------------------------------------------------
 .../schema/src/com/cloud/upgrade/dao/Upgrade410to420.java   | 9 +++++++++
 setup/db/db/schema-410to420.sql                             | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b9b36cb/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
index 2e58ddd..773ad62 100755
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -392,6 +392,15 @@ public class Upgrade410to420 implements DbUpgrade {
                     if (rs2.next()) {
                         affinityGroupId = rs2.getLong(1);
                     }
+
+                    // add the domain map
+                    String sqlMap = "INSERT INTO `cloud`.`affinity_group_domain_map` (`domain_id`,
`affinity_group_id`) VALUES (?, ?)";
+                    pstmtUpdate = conn.prepareStatement(sqlMap);
+                    pstmtUpdate.setLong(1, domainId);
+                    pstmtUpdate.setLong(2, affinityGroupId);
+                    pstmtUpdate.executeUpdate();
+                    pstmtUpdate.close();
+
                 }
 
                 rs2.close();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b9b36cb/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 723791d..6eb7534 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -440,7 +440,7 @@ CREATE TABLE `cloud`.`affinity_group_domain_map` (
   `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
   `domain_id` bigint unsigned NOT NULL COMMENT 'domain id',
   `affinity_group_id` bigint unsigned NOT NULL COMMENT 'affinity group id',
-  `subdomain_access` int(1) unsigned COMMENT '1 if affinity group can be accessible from
the subdomain',
+  `subdomain_access` int(1) unsigned DEFAULT 1 COMMENT '1 if affinity group can be accessible
from the subdomain',
   PRIMARY KEY (`id`),
   CONSTRAINT `fk_affinity_group_domain_map__domain_id` FOREIGN KEY (`domain_id`) REFERENCES
`domain`(`id`) ON DELETE CASCADE,
   CONSTRAINT `fk_affinity_group_domain_map__affinity_group_id` FOREIGN KEY (`affinity_group_id`)
REFERENCES `affinity_group`(`id`) ON DELETE CASCADE


Mime
View raw message