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
2c1df02ba1
Removed unused imports
2011-08-18 15:02:04 -07:00
441d9d765c
bug 11154: host can go in Maintenance state only after all vms are migrated from it
...
status 11154: resolved fixed
2011-08-17 12:04:11 -07:00
6291554576
bug 11154: host can go in Maintenance state only after all vms are migrated from it
...
status 11154: resolved fixed
2011-08-17 12:03:53 -07:00
b87c5ba331
bug 11148: VMs that got stopped during Host Maintenance have host_id associated with them
...
status 11148: resolved fixed
enabled vm stop, if the host is last valid host in cluster
2011-08-17 18:14:31 +05:30
37512883f1
bug 11148: VMs that got stopped during Host Maintenance have host_id associated with them
...
status 11148: resolved fixed
enabled vm stop, if the host is last valid host in cluster
2011-08-17 18:11:23 +05:30
812a1f3f7b
Fixed the bug in allocator where cluster was added to avoid set as pod
2011-08-15 10:44:07 -07:00
3945eec0df
Fixed the bug in allocator where cluster was added to avoid set as pod
2011-08-15 10:43:59 -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
bba811a714
Bug 10197:
...
1. don't try HA vms if host hypervisor version changes
2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 17:29:16 -07:00
5f9884d97a
Bug 10197:
...
1. don't try HA vms if host hypervisor version changes
2. fixed a bug related to VM full sync with hosttrack enabled
2011-08-02 16:48:27 -07:00
f043f63eaa
Merged changes from 2.2.8.zucchini
2011-08-02 15:33:48 -07:00
80684861cf
Bug 10197: do not check timeout against cluster which is not managed
2011-08-01 17:01:22 -07:00
7d02ed344e
Bug 10197: do not check timeout against cluster which is not managed
2011-08-01 17:00:58 -07:00
b0b3f16dae
Two things:
...
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer
Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)
changes in line with UI
2011-07-29 11:28:09 -07:00
055ec48ae8
Two things:
...
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer
Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)
changes in line with UI
2011-07-29 11:25:35 -07:00
6fea146903
more index. moved op_lock to memory table to try it
2011-07-27 14:06:40 -07:00
6c493bfb82
Add exception message for AgentManagerImpl.investigate()
2011-07-27 10:53:06 -07:00
3a8e13f968
Add exception message for AgentManagerImpl.investigate()
2011-07-27 10:52:48 -07:00
96568df702
Add exception message for AgentManagerImpl.investigate()
2011-07-27 10:51:44 -07:00
9c627a15f3
Inaccurate clock new gets an mbean to control it
2011-07-25 16:01:31 -07:00
c610925304
moved agent ping to in memory rather than db based
2011-07-25 15:21:06 -07:00
1b56808be5
brought over agent ping uses the same db connection
2011-07-25 10:57:00 -07:00
10ac7753ed
Switched ping to use the same db connection so that running out of db connections won't affect basic operations
2011-07-25 10:36:00 -07:00
3f18192df8
Make all connections READ COMMITTED isolation level instead of setting it everytime we get the db connection causing useless round trips
2011-07-23 14:58:32 -07:00
12cd5db620
deleted a file by mistake
2011-07-22 11:39:16 -07:00
b59c6b4ab6
propagate lock table fix
2011-07-22 11:35:47 -07:00
44ce9488a6
propagate lock table fixes
2011-07-22 11:30:23 -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
c21273d23a
bug 10734: removed global lock in "DirectAgentScanTimerTask". This lock used to prevent the task from executing on multiple management server simultaniously.
...
status 10734: resolved fixed
2011-07-21 16:18:43 -07:00
d6112b1632
Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks"
...
This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.
Conflicts:
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/network/NetworkManagerImpl.java
2011-07-21 16:04:55 -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
ee98887176
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
server/src/com/cloud/host/dao/HostDaoImpl.java
setup/db/db/schema-228to229.sql
2011-07-21 15:28:11 -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
36edf298e7
bug 10373: Intermediate checkin for Domain level guest Virtual networks
2011-07-20 13:44:26 -07:00
bef3b480cd
bug 10197:
...
The step to upgrade xenserver,
1. put cluster in Unmanaged state through UI , then MS will not talk to hosts in the cluster
2. upgrade xenserver according to XenServer upgrade guide.
3. put cluster in Managed state through UI, then MS will reconnect hosts
TODO,
1. UI
2. vm pool sync , leveraged from kelven's work
2011-07-19 15:44:37 -07:00
3881e13387
bug 10197:
...
The step to upgrade xenserver,
1. put cluster in Unmanaged state through UI , then MS will not talk to hosts in the cluster
2. upgrade xenserver according to XenServer upgrade guide.
3. put cluster in Managed state through UI, then MS will reconnect hosts
TODO,
1. UI
2. vm pool sync , leveraged from kelven's work
2011-07-19 15:26:25 -07:00
c48c3edfbc
bug 10271: don't include removed records when search for local storage pool
...
status 10217: resolved fixed
2011-07-19 11:10:53 -07:00
d54f6d536a
propagating transaction isolation fix for merovingian2
2011-07-18 16:48:49 -07:00
5590cd93ce
bug 10716: Changed the connection's isolation level to allow for more concurrency
2011-07-18 16:32:12 -07:00
7a04334b60
bug 10734: removed global lock in "DirectAgentScanTimerTask". This lock used to prevent the task from executing on multiple management server simultaniously.
...
status 10734: resolved fixed
2011-07-18 15:00:13 -07:00
62270fe62e
bug 10734: removed global lock in "DirectAgentScanTimerTask". This lock used to prevent the task from executing on multiple management server simultaniously.
...
status 10734: resolved fixed
2011-07-18 14:32:57 -07:00
392c03ce6f
propagated db connection savings from master
2011-07-18 14:22:49 -07:00
e52a97b969
Switched ping to use the same db connection so that running out of db connections won't affect basic operations
2011-07-18 14:22:49 -07:00
0c53bddb16
bug 10628: root cause is CheckHealthCommand return false, XenServerInvestigator is not called
...
status 10628: resolved fixed
2011-07-15 10:12:54 -07:00
18003deedf
bug 10628: root cause is CheckHealthCommand return false, XenServerInvestigator is not called
...
status 10628: resolved fixed
2011-07-14 20:42:26 -07:00
161b7f1cad
Switched ping to use the same db connection so that running out of db connections won't affect basic operations
2011-07-14 10:48:07 -07:00
alena
frank
Murali Reddy
anthony
Alex Huang
Sheng Yang
Kelven Yang