8a7feb8ec1
Merge branch '2.2.y'
...
Conflicts:
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
api/src/com/cloud/agent/api/to/FirewallRuleTO.java
api/src/com/cloud/agent/api/to/IpAddressTO.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
api/src/com/cloud/api/commands/UpdateNetworkCmd.java
api/src/com/cloud/api/response/CapabilitiesResponse.java
api/src/com/cloud/network/Network.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/firewall/FirewallService.java
api/src/com/cloud/network/lb/LoadBalancingRule.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
api/src/com/cloud/network/rules/FirewallRule.java
api/src/com/cloud/network/rules/RulesService.java
api/src/com/cloud/offering/NetworkOffering.java
client/tomcatconf/commands.properties.in
cloud.spec
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
core/src/com/cloud/storage/template/DownloadManagerImpl.java
core/src/com/cloud/vm/DomainRouterVO.java
debian/cloud-deps.install
patches/systemvm/debian/config/etc/init.d/cloud-early-config
patches/systemvm/debian/config/root/ipassoc.sh
patches/systemvm/debian/config/root/loadbalancer.sh
scripts/vm/hypervisor/kvm/rundomrpre.sh
scripts/vm/hypervisor/xenserver/vmops
server/src/com/cloud/agent/manager/AgentAttache.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/agent/manager/AgentMonitor.java
server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
server/src/com/cloud/alert/ClusterAlertAdapter.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/cluster/ClusterManagerImpl.java
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/host/dao/HostDaoImpl.java
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/network/LoadBalancerVO.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDao.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/element/DhcpElement.java
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/FirewallManager.java
server/src/com/cloud/network/rules/FirewallRuleVO.java
server/src/com/cloud/network/rules/PortForwardingRuleVO.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/rules/StaticNatRuleImpl.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/server/ConfigurationServerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/StorageManager.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
server/src/com/cloud/upgrade/dao/Upgrade228to229.java
server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
server/src/com/cloud/user/AccountManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDao.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
setup/db/create-index-fk.sql
setup/db/create-schema.sql
setup/db/db/schema-222to224.sql
setup/db/db/schema-227to228.sql
setup/db/db/schema-228to229.sql
setup/db/db/schema-229to2210.sql
tools/testClient/README
ui/scripts/cloud.core.instance.js
utils/src/com/cloud/utils/SerialVersionUID.java
utils/src/com/cloud/utils/db/ConnectionConcierge.java
utils/src/com/cloud/utils/db/Merovingian2.java
utils/src/com/cloud/utils/db/Transaction.java
utils/src/com/cloud/utils/nio/Link.java
utils/src/com/cloud/utils/nio/NioConnection.java
utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
18f87c2108
Merge branch 'cvm' into 2.2.y
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/listener/StoragePoolMonitor.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
6aaf3d5ae0
Merge branch 'cvm'
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/storage/Storage.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
c6fba0fd42
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
262e6784e5
Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
...
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load
status 10860: resolved fixed
2011-07-27 17:41:38 -07:00
1381c58fa1
Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
...
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load
status 10860: resolved fixed
2011-07-27 17:32:12 -07:00
b59c6b4ab6
propagate lock table fix
2011-07-22 11:35:47 -07:00
66713a490d
fixed problem with the standalone connection has open transaction
2011-07-22 11:25:43 -07:00
3a6f3b71e0
bug 10791: add data integrity check upon management server startup
2011-07-21 17:08:29 -07:00
95b48ba222
bug 10791: add data integrity check upon management server startup
2011-07-21 17:07:21 -07:00
b1d5b5a51d
2 fixes for Agent Load Balancer:
...
* when management server dies and notifies other management servers about this, the running management server has to cleanup host_transfer records belonging to the died management server
* issue agent load balancing task only when agent load (number of connected agents in the system) exceeds "agent.load.threshold" - 70% by default
2011-07-21 15:43:52 -07:00
307741edcd
2 fixes for Agent Load Balancer:
...
* when management server dies and notifies other management servers about this, the running management server has to cleanup host_transfer records belonging to the died management server
* issue agent load balancing task only when agent load (number of connected agents in the system) exceeds "agent.load.threshold" - 70% by default
Conflicts:
server/src/com/cloud/configuration/Config.java
setup/db/db/schema-228to229.sql
2011-07-21 15:27:50 -07:00
392c03ce6f
propagated db connection savings from master
2011-07-18 14:22:49 -07:00
281201be8e
Make cluster request timeout to be configurable
2011-07-14 18:23:23 -07:00
61676ff3ea
Make cluster request timeout to be configurable
2011-07-14 18:11:32 -07:00
11527ad914
bug 10699: log on listener registration
2011-07-12 16:58:55 -07:00
40145b0b8b
add logging to clustering notification
2011-07-12 16:14:58 -07:00
6d8eb45bad
add logging to clustering notification
2011-07-11 17:16:23 -07:00
e4bd357c53
bug 10677: add client side time out to cluster servlet interface
2011-07-11 13:37:33 -07:00
b9f00ccbab
bug 10677: add client side time out to cluster servlet interface
2011-07-11 12:08:12 -07:00
72cbd65db2
bug 10668: add DB upgrade scripts for 2.2.7 to 2.2.8 upgrade
2011-07-08 18:12:13 -07:00
ea48d40e5f
connection conierge to deal with connections that are not returned to pools
2011-07-08 18:04:57 -07:00
f28a2b40a3
bug 10501: This is really Kelven's bug but I'll fix it for him anyways. DAO code already have a way to extract the DB connection from a transaction that is stored in the TLS. There's no real reason for the DAO code to add special semantics to use a different DB connection. That can be done by simply switching the transaction before it even reached the dao code. Think about it. Why would anyone want to call one dao function, switch transaction, and then switch back. The right thing is for the caller to switch transaction, call a series of dao codes, and switch it back. That's the semantics I changed to. By doing this, it also eliminates the number of debug messages in this bug.
2011-07-01 11:03:37 -07:00
cfc25d01be
bug 10501: This is really Kelven's bug but I'll fix it for him anyways. DAO code already have a way to extract the DB connection from a transaction that is stored in the TLS. There's no real reason for the DAO code to add special semantics to use a different DB connection. That can be done by simply switching the transaction before it even reached the dao code. Think about it. Why would anyone want to call one dao function, switch transaction, and then switch back. The right thing is for the caller to switch transaction, call a series of dao codes, and switch it back. That's the semantics I changed to. By doing this, it also eliminates the number of debug messages in this bug.
2011-07-01 11:03:12 -07:00
7a4af21f72
bug 10322: Transaction is using the new Merovingian
2011-06-29 15:34:53 -07:00
81213c2be2
bug 10322: Transaction is using the new Merovingian
2011-06-29 12:35:30 -07:00
c8c84af109
bug 10322: integrated into cluster management
2011-06-29 12:03:36 -07:00
fefc798197
bug 10322: better mannered merovingians
2011-06-29 12:03:22 -07:00
687e9f6e67
bug 10322: arrival of the next generation Merovingians
2011-06-29 12:03:05 -07:00
27809e651e
bug 10322: arrival of the next generation Merovingians
2011-06-29 12:02:53 -07:00
63f552995f
bug 10322: integrated into cluster management
2011-06-29 12:01:43 -07:00
e16a013335
bug 10322: better mannered merovingians
2011-06-29 12:01:43 -07:00
2219269e83
bug 10322: arrival of the next generation Merovingians
2011-06-29 12:01:43 -07:00
cbee5a6044
bug 10322: arrival of the next generation Merovingians
2011-06-29 12:01:43 -07:00
89269069f9
Added JMX to Transaction
2011-06-28 01:17:46 -07:00
b7e4298c94
Added JMX to Transaction
2011-06-27 17:24:26 -07:00
18dc85c765
Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance)
2011-06-27 10:37:00 -07:00
826f5eedf1
bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case.
...
status 10447: resolved fixed
2011-06-27 10:37:00 -07:00
41f12eb642
Pass isForRebalance parameter to processConnect method of all the listeners - some listeners don't have to be notified when connection happens as a a part of Agent Rebalance process (VirtualMachineManagerImpl listener for instance)
2011-06-27 10:20:41 -07:00
0bf34f3612
bug 10447: don't notify VirtualMachineManager listener when do host rebalance - vm sync is not needed in this case.
...
status 10447: resolved fixed
2011-06-27 10:20:40 -07:00
f3d7d075ee
bug 10449: handle the case when cluster servlet may be called during management server initialization phase
2011-06-24 18:14:11 -07:00
a295e381a7
bug 10449: handle the case when cluster servlet may be called during management server initialization phase
2011-06-24 18:12:25 -07:00
1db2667c54
bug 10029: update mshost state instead of removing it
2011-06-24 11:18:28 -07:00
0be54ec4b6
bug 10029: update mshost state instead of removing it
2011-06-24 11:16:40 -07:00
f91122654b
bug 10176: add cluster listener registration back
2011-06-23 14:52:15 -07:00
8490fc2bf5
bug 10176: add cluster listener registration back
2011-06-23 14:50:58 -07:00
4335b8b179
bug 10416: fixed the bug in agentLoadBalancerPlanner
...
status 10416: resolved fixed
2011-06-22 17:14:14 -07:00
48c2f68af0
bug 10416: fixed the bug in agentLoadBalancerPlanner
...
status 10416: resolved fixed
2011-06-22 17:16:04 -07:00
b2b4a63fd3
Some fixes to agent lb code:
...
* Schedule agent LB as a TimerTask as it can take time for the management server to start; and it can accept rebalance requests only when it's up and running
* Removed Starting state from mshost as it's not being used anywhere
* Fixed the bug where requests weren't routed properly from the old host owner to the new one.
2011-06-13 22:31:49 -07:00
00a35314bb
Some fixes to agent lb code:
...
* Schedule agent LB as a TimerTask as it can take time for the management server to start; and it can accept rebalance requests only when it's up and running
* Removed Starting state from mshost as it's not being used anywhere
* Fixed the bug where requests weren't routed properly from the old host owner to the new one.
2011-06-13 22:28:22 -07:00
alena
frank
Alex Huang
Kelven Yang