From 6ad712d1c46266c485affe0b0f32a6a9221495f6 Mon Sep 17 00:00:00 2001 From: kishan Date: Tue, 8 Nov 2011 15:53:32 +0530 Subject: [PATCH 1/3] bug 11851: When Add VPN user fails, remove the user entry from db instead of leaving in Add state. status 11851: resolved fixed reviewed-by: Abhi --- .../src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index f87890856fe..3f8b92a16fd 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -432,6 +432,9 @@ public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manag _vpnUsersDao.remove(user.getId()); } } else { + if (user.getState() == State.Add) { + _vpnUsersDao.remove(user.getId()); + } s_logger.warn("Failed to apply vpn for user " + user.getUsername() + ", accountId=" + user.getAccountId()); } } From 884b9f3a35877a1653a82c82e11b2af7c30a69a2 Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Tue, 8 Nov 2011 16:44:48 +0530 Subject: [PATCH 2/3] bug 11880: host status is now in sync --- api/src/com/cloud/agent/api/ClusterSyncCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/com/cloud/agent/api/ClusterSyncCommand.java b/api/src/com/cloud/agent/api/ClusterSyncCommand.java index 83b79cbbddb..9a674af647c 100644 --- a/api/src/com/cloud/agent/api/ClusterSyncCommand.java +++ b/api/src/com/cloud/agent/api/ClusterSyncCommand.java @@ -59,7 +59,7 @@ public class ClusterSyncCommand extends Command implements CronCommand { @Override public boolean executeInSequence() { - return true; + return false; } } \ No newline at end of file From 4a8050644817f8f9154a0d380e7e422e5cba9d46 Mon Sep 17 00:00:00 2001 From: kishan Date: Wed, 9 Nov 2011 16:26:11 +0530 Subject: [PATCH 3/3] bug 11938: Removed unique constraint on usage_network_offering table. status 11938: resolved fixed reviewed-by: Abhi --- server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java | 9 +++++++++ setup/db/create-schema-premium.sql | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java b/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java index e4200ba373a..8d25fa5cabd 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java @@ -92,5 +92,14 @@ public class Upgrade2212to2213 implements DbUpgrade { // drop primary keys DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_load_balancer_policy"); DbUpgradeUtils.dropPrimaryKeyIfExists(conn, "cloud_usage.usage_port_forwarding"); + + //Drop usage_network_offering unique key + try { + PreparedStatement pstmt = conn.prepareStatement("drop index network_offering_id on cloud_usage.usage_network_offering"); + pstmt.executeUpdate(); + s_logger.debug("Dropped usage_network_offering unique key"); + } catch (Exception e) { + // Ignore error if the usage_network_offering table or the unique key doesn't exist + } } } diff --git a/setup/db/create-schema-premium.sql b/setup/db/create-schema-premium.sql index 83aa7a45140..bd27cb3d5f9 100644 --- a/setup/db/create-schema-premium.sql +++ b/setup/db/create-schema-premium.sql @@ -249,8 +249,7 @@ CREATE TABLE `cloud_usage`.`usage_network_offering` ( `network_offering_id` bigint unsigned NOT NULL, `is_default` smallint(1) NOT NULL, `created` DATETIME NOT NULL, - `deleted` DATETIME NULL, - UNIQUE KEY (`network_offering_id`, `vm_instance_id`, `created`) + `deleted` DATETIME NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__account_id`(`account_id`);