etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y

This commit is contained in:
Naredula Janardhana Reddy 2011-11-09 16:37:03 +05:30
parent 1148ebfdcd 4a80506448
commit 516ea0ee0f
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/agent/api/ClusterSyncCommand.java
View File

@ -59,7 +59,7 @@ public class ClusterSyncCommand extends Command implements CronCommand {
@Override
public boolean executeInSequence() {
return true;
return false;
}
}

3
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
View File

@ -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());
}
}

9
server/src/com/cloud/upgrade/dao/Upgrade2212to2213.java
View File

@ -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
}
}
}

3
setup/db/create-schema-premium.sql
View File

@ -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`);