85f18ff256
fix build, add test rpm back
2011-08-24 13:24:51 -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
d763d809cc
bug 10848: Introducing an api - ListCapacityByType. Add the basic DB layer in the command.
2011-08-09 18:12:37 +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
c6fba0fd42
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
c37d75fc00
release capacity if current state is in starting and not transit to running
2011-08-04 14:28:40 -07:00
e5478457ee
don't put cpu/mem into reserved capacity if failed to start/stop vm
2011-08-04 14:28:33 -07:00
1d49275ca8
release capacity if current state is in starting and not transit to running
2011-08-04 14:26:21 -07:00
ccdfe240bd
don't put cpu/mem into reserved capacity if failed to start/stop vm
2011-08-04 14:26:21 -07:00
cd531d7562
bug 10770: don't select cluster if it's removed in firstfitplanner
...
status 10770: resolved fixed
2011-07-22 15:10:25 -07:00
8c1d77b23e
bug 10770: don't select cluster if it's removed in firstfitplanner
...
status 10770: resolved fixed
2011-07-22 15:06:33 -07:00
c510c0540a
bug 10422: Correcting host capacity checker thread runs. Removing the thread.sleep method and using the scheduleWithFixedDelay to execute the thread at fixed delays. Also making the hostCapacityChecker thread use the common function used by computeCapacityListener.
...
status 10422: resolved fixed
2011-06-30 13:00:44 +05:30
91e016114e
bug 10422: Correctly populating the used and reserved capacity in ComputeCapacityListener Status 10422: resolved fixed
2011-06-29 15:40:47 +05:30
1eb8e61c43
bug 10422: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in.
...
status 10422: resolved fixed
2011-06-29 15:27:06 +05:30
474d666f79
bug 10422: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in.
...
status 10422: resolved fixed
2011-06-29 14:34:24 +05:30
a2bdcf5159
bug 10422: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in.
...
status 10422: resolved fixed
2011-06-29 14:34:23 +05:30
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
be38384e76
bug 10414: update VM sync logic and capacity management to sync VM state change initiated from external source
2011-06-22 18:25:35 -07:00
7f8b129dc5
bug 10414: update VM sync logic and capacity management to sync VM state change initiated from external source
2011-06-22 18:23:43 -07:00
486c75ea4b
Bug 9780 - ComputeCapacityListener should not use 'cpu.overprovisioning.factor' while adding capacity entries
...
Changes:
Reapplying the changes from fix 9539 that were missing in ComputeCapacityListener.java
Change is to not consider cpu.overprovisioning.factor while creating CPU capacity entries.
This factor is applied by allocators to the values in the capacity table. Capacity table should contain the actual CPU value and not the overprovisioned CPU value.
2011-05-06 18:05:12 -07:00
117a81acf6
cleanup agent manager
2011-05-05 17:57:06 -07:00
948df86f5d
accidental commit
2011-05-03 10:46:13 -07:00
7a29f8dc48
more fixes prior to pushing the merge
2011-05-03 10:41:31 -07:00
a32c39cccd
Merge from zonesfeature
2011-05-03 10:41:31 -07:00
303e2a7481
Start of zonesfeature / mycloud/cloudkit
2011-05-03 10:40:17 -07:00
1d4a59ce73
Bug 9666 - hostId and spoolId overlap in op_host_capacity table
...
Changes:
- When a host connects, we check if it has a CPU and RAM entry in capacity table. If the entry is found, the values are updated if possible. If the entry is not found a new one is inserted.
- The searchCriteria used to check if CPU entry is present was wrong. We were passing in a criteria which did not specify capacityType. So for hostId >= 200, the serach would return capacity entries of storage pools also since poolIDs start from 200 onwards.
- Since an entry was found (although the wrong one), we tried to update it. But update does not happen since the capacity ranges dont match.
And a new insert for CPU also does not happen since an entry is found.
- So as a result CPU entries are never inserted in the table for hostIds >=200
- As a fix, corrected the search criteria.
- During VM deployment, when the entry is not found, we get a NPE. Added a null check to avoid that.
2011-05-02 15:17:30 -07:00
b84a7477f0
Bug 9539 - cpu.overprovisioning.factor does not work
...
Changes:
- Changed host allocators/planner to use cpu.overprovisioning.factor
- Removed following: while adding a new host, we were setting the total_cpu in op_host_capacity to be actual_cpu * cpu.overprovisioning.factor. Now we set it to actual_cpu.
- ListCapacities response now calculates the total CPU as actual * cpu.overprovisioning.factor (This change does not add anything new - listCapacities was pulling total CPU from op_host_capacity DB earlier which had the cpu.overprovisioning.factor applied already. Now we need to apply it over the DB entry.)
- HostResponse has a new field: 'cpuWithOverprovisioning' that returns the cpu after applying the cpu.overprovisioning.factor
- Db Upgrade 222 to 224 now updates the total_cpu in op_host_capacity to be the actual_cpu for each Routing host.
2011-04-22 18:09:31 -07:00
d6b5acb852
bug 8532,8755: don't create multiple HA work if there already has one of HAwork of this VM is created, but not finished
...
status 8532: resolved fixed
status 8755: resolved fixed
2011-04-14 17:46:54 -04:00
0fa06646ba
Bug 9310 - HostCapacityChecker thread does not cleanup reserved capacity for hosts that are not in 'Up' state
...
List all 'Routing' hosts irrespective of the State.
2011-04-14 13:24:14 -07:00
92155522f2
Add license header to files
2011-04-14 11:23:14 -07:00
2bcd7a13d4
hostid and poolid may overlap, fixed deletePoolStats
2011-04-05 15:43:21 -07:00
92c0b3b82f
Bug 9309 - In Manual migration, do not consider 'reserved_capacity' when computing available memory in destination
...
Changes:
- Now while listing hosts for migration, capacity is calculated as total_capacity -used_capacity
instead of total_capacity -(used_capacity + reserved_capacity)
- Also, the capacity columns in op_host_capacity are now 'signed' type so that the subtractions in queries does not overflow.
- Added this to DB upgrade 222 to 224 change as well.
2011-04-05 14:06:32 -07:00
ed9a11c6b6
API changes for Bug 3316 - Manual live migration of Virtual Machines
...
This is a Root admin only functionality
---------------------
Service API changes:
---------------------
- ManagementServer will expose new API:
Pair<List<HostVO>, List<Long>> listHostsForMigrationOfVM(UserVm vm, Long
startIndex, Long pageSize)
The API returns list of all hosts in the VM's cluster minus the current host and also a list of hostIds that seem to have enough CPU and RAM capacity to host this VM.
- ListHostsCmd will call this service API if virtualmachineid is present in the request.
- MigrateVmCmd is the new command added that takes in virtualmachineid and destination hostid
- UserVmService will expose a new API: UserVm migrateVirtualMachine(UserVm vm, Host destinationHost)
------------------------------------
API throws error in following cases:
------------------------------------
- User is not a root Admin. (‘Permission denied’)
- A VM uses local storage, we cannot migrate it, so ‘listHosts’ will throw error.
- We fail to migrate the VM on the chosen host.
- API will support migration for XenServer only currently. So error is thrown
if hypervisor is not XenServer (e.g KVM, vSphere etc)
- Destination host is not in same cluster as source host.
- VM is not in running state
2011-03-11 17:49:53 -08:00
6a67bb1edb
More logging changes for
...
Bug 7845 Productize DeploymentPlanner
Bug 8317 Add better resource allocation failure messages
2011-02-28 13:47:52 -08:00
889827b63a
Bug 7845 - Productize DeploymentPlanner
...
Bug 7723 - merge or re-write host tagging into master / 2.2
Bug 7627 - Need more logging for Allocators
Bug 8317 - Add better resource allocation failure messages
Changes for Deployment Planner to use host and storagePool allocators to find deployment destination.
Also has the changes for host tag feature.
Improved the logging for allocators.
2011-02-28 13:47:51 -08:00
7dd54f079b
started vms with these latest
2011-02-11 17:03:04 -08:00
25a9236438
add shuffling back
2011-02-09 14:24:32 -05:00
08285af33f
fix capacity caclulation issue after migration
2011-02-09 13:33:42 -05:00
f16cb1caf2
Logs statements cleanup
2011-02-08 14:14:52 -08:00
169ac1ce57
bug 8464,8404: allocator is not move reserved resource to used resource, in some case
...
status 8464: resolved fixed
status 8404: resolved fixed
2011-02-08 10:32:14 -05:00
fc97034000
refactor vmstatelistener
2011-01-26 11:01:43 -05:00
d1aa043aba
bug 7525: Cleaning up primary storage stats from op_host_Capacity(reflected on dashboard) when primary storage is deleted.
...
status 7525 : resolved fixed
2011-01-20 20:38:43 +05:30
3bd089acb5
don't break old code
2010-12-04 16:49:05 -08:00
2e3ef1408c
refactor
2010-12-04 14:59:40 -08:00
41fdbfc65e
new allocator
2010-12-04 14:59:39 -08:00
d38f7fd56d
Moved DAO to server
2010-11-22 07:40:41 -08:00
frank
alena
Nitin
Edison Su
Kelven Yang
prachi
Alex Huang
Chiradeep Vittal
anthony