Commit Graph

264 Commits

Author SHA1 Message Date
Marcus Sorensen
71a5bd29ea Merge branch '4.4' into resize-root 2014-03-14 03:38:07 -06:00
Mike Tutkowski
709d2a096d CLOUDSTACK-6170 2014-03-14 23:44:50 -06:00
Kelven Yang
1db329f0f9 Fix the missing java imports from automatic merge 2014-03-14 15:08:32 -07:00
Kelven Yang
ba56210127 Deal with concurrent state update for VM and Host objects. 2014-03-14 15:08:04 -07:00
Marcus Sorensen
c02c634945 Merge branch '4.4' into resize-root 2014-03-14 02:27:26 -06:00
Marcus Sorensen
f52c7430f6 Merge branch 'master' into resize-root 2014-03-13 23:32:05 -06:00
Kelven Yang
4399e245f4 A typo that leads to opposite decision on determine whether or not to notify out-of-band VM state changes. 2014-03-13 17:17:15 -07:00
Kelven Yang
5a75a3e1f9 Give graceful state transition period to live with race-condition on VM startup time 2014-03-13 16:59:56 -07:00
Kelven Yang
6ad245e675 Restore to old HA logic, but suppress VM state change on resource state report to avoid interferring HA. 2014-03-13 16:59:56 -07:00
Kelven Yang
53f306e8e2 Send StopCommand(Cleanup) if out-of-band power-off VM is detected. 2014-03-13 16:59:56 -07:00
Min Chen
84a528fad6 Merge branch 'master' into rbac 2014-03-13 14:52:37 -07:00
Min Chen
99bdc8d875 Merge branch 'master' into rbac. 2014-03-13 11:05:03 -07:00
Alena Prokharchyk
1b83698dac deployVm/startVm APIs: ability to define deploymentPlanner for VmToStart in the api call (available to ROOT admin only) 2014-03-13 10:23:34 -07:00
Sheng Yang
f45de30d1b CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot 2014-03-11 13:04:26 -07:00
Sanjay Tripathi
c7d31fe288 CLOUDSTACK-4760 : Enabling GPU support for XenServer.
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.

This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
2014-03-11 15:44:51 +05:30
Mike Tutkowski
1d74daf6fe CLOUDSTACK-6170 2014-03-10 11:43:54 -06:00
Mike Tutkowski
c427e8db1c CLOUDSTACK-6170 2014-03-07 15:38:50 -07:00
Min Chen
48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Anthony Xu
370554e9d9 only ping timeout trigger host HA, otherwise there may be two threads try to HA the same VM 2014-03-05 16:50:33 -08:00
Anthony Xu
ad88bbb684 Use seperate path to sync VM metadata for XS
VM status sync only does VM status sync
2014-03-05 15:44:50 -08:00
Anthony Xu
ab1d3af460 Use seperate path to sync VM metadata for XS
VM status sync only does VM status sync
2014-03-05 15:44:50 -08:00
Mike Tutkowski
b06e66c50a CLOUDSTACK-6170 2014-03-05 13:55:12 -07:00
Alena Prokharchyk
5a8d165afa CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic
Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
2014-03-04 15:37:52 -08:00
Kelven Yang
90262a81ec Do not do investigation for SSVM/CPVM agent host upon disconnect. 2014-02-28 15:36:00 -08:00
Kelven Yang
b21662f890 make sure XS report VM state even if there is no running VM on the host. 2014-02-28 15:35:59 -08:00
Kelven Yang
7c7bd0934a pass InsufficientCapacityException across job boundary since some HA logic relies on it. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang
537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang
fed85813e9 use lock table for locking 2014-02-28 15:35:58 -08:00
Kelven Yang
e6e12e33de VirtualMachineManager.checkWorkItems() uses wrong time unit 2014-02-28 15:35:58 -08:00
Kelven Yang
38a1300141 pass NULL host when performing state transition to follow-up with VM power-off report 2014-02-28 15:35:58 -08:00
Kelven Yang
fa7d9ad1a8 VirtualMachineManager.migrateAway() need to put under management of new sync model 2014-02-28 15:35:58 -08:00
Kelven Yang
434f8dab72 Remove the hacking way of blocking VM state transition introduced by individual VM snapshot orchestration flow 2014-02-28 15:35:58 -08:00
Kelven Yang
58c26ee128 return the correct NicProfile after job completion for VPC AddVmToNetwork command 2014-02-28 15:35:58 -08:00
Kelven Yang
18b5fb5a3c do not shutdown alien VMs upon host startup. Send StopCommand for out-of-band stopped VM to restore legacy XS/KVM behave 2014-02-28 15:35:58 -08:00
Kelven Yang
85adaf83c7 check report-missing event for VM in starting state. 2014-02-28 15:35:57 -08:00
Kelven Yang
13e956a10c Add a missing initialization call to setup EntityManager in VmMigrateWork 2014-02-28 15:35:57 -08:00
Kelven Yang
86a63c49bc propagate job execution runtime exception to API context 2014-02-28 15:35:57 -08:00
Kelven Yang
206a9ed53f disable XS full host sync and delta sync when new sync model is enabled 2014-02-28 15:35:57 -08:00
Kelven Yang
90ea3249a8 disable cluster-scope report from XS resource 2014-02-28 15:35:57 -08:00
Kelven Yang
5d73217723 process the missing power report of a VM that exists in CloudStack but not in hypervisor 2014-02-28 15:35:57 -08:00
Kelven Yang
fda7219646 CLOUDSTACK-5928: disable host delta sync when new VM sync is enabled 2014-02-28 15:35:57 -08:00
Kelven Yang
441be43b8c CLOUDSTACK-5358: Bring back concurrency control in sync-queue management 2014-02-28 15:35:57 -08:00
Prachi Damle
f41604fc6c Renaming AclEntityType --> IAMEntityType 2014-02-25 16:43:17 -08:00
wrodrigues
3a7e4103fc FindBugs findings: fixing equals() methods in 2 classes; commenting out dead variable in 1 class; adding 5 tests to cover the changes in the equals() methods.
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-02-25 15:18:16 +01:00
Koushik Das
167babd8c8 CLOUDSTACK-6124: During MS maintenance unfinished work items are not cleaned up resulting in them getting repeated for every subsequent maintenance
Updating the op_it_work table entry appropriately in db once the unfinished work item is completed.
2014-02-21 16:29:51 +05:30
Hugo Trippaers
97bad4f9b3 Fix checkstyle and license issues 2014-02-14 18:37:47 +01:00
Hugo Trippaers
26b32141a8 Findbugs : Fixes for several findings
Made a comment on the use of ConcurrentHashMap for _agent
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2014-02-14 18:37:45 +01:00
Marcus Sorensen
dd4f6bfacf Merge branch 'master' into resize-root 2014-02-10 20:12:56 -07:00
Marcus Sorensen
b8f571ffd5 Merge branch 'master' into resize-root 2014-02-10 10:49:12 -07:00
Marcus Sorensen
0eb9967354 Merge branch 'master' into resize-root 2014-03-07 17:21:57 -07:00