13ee22d421
bug 10078:
...
1. introduce migratewait in global configuration, the default value is 1 hour
2. use async xapi VM migration API
status 10078: resolved fixed
2011-09-07 12:36:17 -07:00
4d3d47f01c
bug 11304: restore host status after initialization failure
2011-09-02 15:19:36 -07:00
c683fda236
set timeout for CheckOnHostCommand to 50 s
2011-09-02 15:01:32 -07:00
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
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
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
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
c610925304
moved agent ping to in memory rather than db based
2011-07-25 15:21:06 -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
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
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
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
0dacd3913a
bug 10423: agent in ssvm needs to add default keystore, as we copying templates through https://**realhostip .**
...
status 10423: resolved fixed
2011-07-08 13:49:43 -07:00
a24eef5c81
add new option to force destroy vm when delete host, if the VMs are created on local storage
2011-07-08 13:49:05 -07:00
8306bf7ee5
fix ebtable cleanup issue: on ubuntu, it's not got deleted if vm is stopped
2011-07-08 13:31:34 -07:00
76d4636823
bug 10190: add log if failed to delete host when host is in UP state
2011-07-08 13:19:16 -07:00
761af73f24
bug 9855: two fixes.
...
1. can not cancel maintenace mode.
2. maintenance related modes are preserved through MS restart
status 9855: resolved fixed
2011-06-27 13:47:43 -07:00
468136be74
bug 9855: two fixes.
...
1. can not cancel maintenace mode.
2. maintenance related modes are preserved through MS restart
status 9855: resolved fixed
2011-06-27 13:48:12 -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
3642aef4c6
bug 10423: agent in ssvm needs to add default keystore, as we copying templates through https://**realhostip .**
...
status 10423: resolved fixed
2011-06-24 14:45:47 -04:00
28f0068151
add new option to force destroy vm when delete host, if the VMs are created on local storage
2011-06-23 20:36:13 -04:00
62249f3eae
1. return message to UI if adding primary storage failed
...
2. delete primary storage entry if if adding primary storage failed
2011-06-22 18:44:33 -07:00
4bbed17d02
1. return message to UI if adding primary storage failed
...
2. delete primary storage entry if if adding primary storage failed
2011-06-22 18:39:21 -07:00
ad5162ef86
fix ebtable cleanup issue: on ubuntu, it's not got deleted if vm is stopped
2011-06-16 19:26:24 -04:00
fc28a332c5
bug 10271: don't include removed records when search for local storage pool
...
status 10217: resolved fixed
2011-06-16 16:00:45 -07:00
2e8d1bbd6c
bug 10190: add log if failed to delete host when host is in UP state
2011-06-15 12:02:31 -04:00
f7e4fc742f
merge adding host fix from 2.2.4
2011-06-14 17:54:42 -07:00
anthony
Kelven Yang
alena
frank
Murali Reddy
Alex Huang
Sheng Yang
Edison Su