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

bug 13471: disabling LB during install and upgrade 

reviewed-by: kishan
This commit is contained in:
abhi 2012-02-07 10:21:31 +05:30
parent e08b8d0138
commit 0e5b3febd1
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -339,6 +339,9 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
@Override
public void disconnected() {
synchronized (_cluster.intern()) {
s_vms.clear(_cluster);
}
}
protected boolean pingdomr(Connection conn, String host, String port) {

4
server/src/com/cloud/configuration/Config.java
View File

@ -284,8 +284,8 @@ public enum Config {
DefaultMaxAccountSnapshots("Account Defaults", ManagementServer.class, Long.class, "max.account.snapshots", "20", "The default maximum number of snapshots that can be created for an account", null),
DefaultMaxAccountVolumes("Account Defaults", ManagementServer.class, Long.class, "max.account.volumes", "20", "The default maximum number of volumes that can be created for an account", null),
DirectAgentLoadSize("Advanced", ManagementServer.class, Integer.class, "direct.agent.load.size", "16", "The number of direct agents to load each time", null),
AgentLbEnable("Advanced", ClusterManager.class, Boolean.class, "agent.lb.enabled", "true", "If agent load balancing enabled in cluster setup", null),
// disabling for 2.2.14 as cluster sync does not work with lb
AgentLbEnable("Advanced", ClusterManager.class, Boolean.class, "agent.lb.enabled", "false", "If agent load balancing enabled in cluster setup", null),
SubDomainNetworkAccess("Advanced", NetworkManager.class, Boolean.class, "allow.subdomain.network.access", "true", "Allow subdomains to use networks dedicated to their parent domain(s)", null),
UseExternalDnsServers("Advanced", NetworkManager.class, Boolean.class, "use.external.dns", "false", "Bypass the cloudstack dhcp/DNS server vm name service, use zone external dns1 and dns2", null),
EncodeApiResponse("Advanced", ManagementServer.class, Boolean.class, "encode.api.response", "false", "Do UTF-8 encoding for the api response, false by default", null),

4
setup/db/db/schema-2213to2214.sql
View File

@ -57,4 +57,6 @@ ALTER TABLE `cloud`.`domain_router` MODIFY `redundant_state` varchar(64) NOT NUL
ALTER TABLE `cloud`.`domain_router` MODIFY `stop_pending` int(1) unsigned NOT NULL COMMENT 'if this router would be stopped after we can connect to it';
ALTER TABLE `cloud`.`service_offering` MODIFY `limit_cpu_use` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Limit the CPU usage to service offering';
ALTER TABLE `cloud`.`service_offering` MODIFY `limit_cpu_use` tinyint(1) unsigned NOT NULL default '0' COMMENT 'Limit the CPU usage to service offering';
UPDATE `cloud`.`configuration` SET `value`='false' WHERE `name`='agent.lb.enabled';