Edison Su
25a6234a5b
fix build
2014-03-28 16:24:45 -07:00
Edison Su
7590988dd7
CLOUDSTACK-5329: stupid java box/unbox
...
Conflicts:
engine/schema/src/com/cloud/vm/VMInstanceVO.java
2014-03-28 16:24:22 -07:00
Edison Su
504a6cdee2
CLOUDSTACK-5432:sync vm and storage commands on mgt server for kvm
...
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/hypervisor/KVMGuru.java
2014-03-28 16:24:07 -07:00
Edison Su
e656201fee
CLOUDSTACK-5395: mark snapshot_store_ref as destroyed in case of backup snapshot failed
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
2014-03-28 16:21:22 -07:00
Daan Hoogland
8b62b2cb92
findbugs: exclude known spiffy hacks a.k.a. false positives
2014-03-28 14:28:10 +01:00
Anthony Xu
6d103e62fe
use correct interval for cleanTask and transitionTask
2014-03-26 14:22:27 -07:00
Alex Huang
4ebb92c492
Fixed some warnings about using a deprecated constructor
2014-03-25 16:48:27 -07:00
Alex Huang
f445274ed3
Added a config to enable checking whether a db transaction is wrapped around communications with the agent. If it is, an exception is thrown. This assert has actually been there because it is part of CloudStack's design principle to not use db transactions as a way to enforce atomicity in executing things on hardware resources. However, the assert has been ignored since the move to maven which is not good with enabling asserts. Since then, there's been a lot of commands added that actually runs within db transaction. This is a big no no as the problem is that the remote operation may take a long time and the db can actually close the connection, causing a rollback of the transaction. We should not depend on transactions to enforce the atomicity anyways.
2014-03-25 16:35:49 -07:00
Anthony Xu
e3fc5a4d46
vm meta sync sync xstoolsversion as well
2014-03-24 15:48:21 -07:00
Laszlo Hornyak
2c4ac5e4d3
removed some redundant Boolean isntantiations
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-03-22 18:34:45 +01:00
Mike Tutkowski
b354893393
CLOUDSTACK-6170 (Fixed an issue where custom compute offering and custom storage IOPS were leading to custom storage IOPS that were specified not being used)
2014-03-22 11:09:34 -06:00
Mike Tutkowski
7629d6f129
CLOUDSTACK-6170
2014-03-20 23:54:53 -06:00
Min Chen
a1831bc864
Revert "CLOUDSTACK-6170" due to unit test failure.
...
This reverts commit 50b5e2e247ebff54fda8c8c2cd4957ffd47bcf12.
2014-03-20 16:40:45 -07:00
Mike Tutkowski
50b5e2e247
CLOUDSTACK-6170
2014-03-20 16:52:52 -06:00
Chris Suich
27008216fe
Revert "Issue CS-5825 Part Resolution"
...
This reverts commit 9a615ee7b26547f0c439faf04e5fbf91dc2cbeb1 which was breaking the build.
2014-03-20 15:47:13 -04:00
Alex Hitchins
9a615ee7b2
Issue CS-5825 Part Resolution
2014-03-20 13:30:42 -04:00
Murali Reddy
2b51207510
persist fact that network can span multiple zones, if network offering
...
has strechedL2Subnet capability and return the zones in which
network spans in the networkreponse object
2014-03-20 17:01:33 +05:30
Murali Reddy
d2d54a9463
region level VPC support
...
introduce 'RegionLevelVpc' as capability of 'Connectivity' service. Add
support for CreateVPCOffering to take the 'regionlevelvpc' as capability
of service 'connectivity'.
introduces new capability 'StretchedL2Subnet' for 'Connectivity'
service. Also add support to createNetworkOffering api to allow
StretchedL2Subnet capablity for the connectivity service.
adds check to ensure 'Connectivity' service provider supports
'StretchedL2Subnet' and 'RegionLevelVpc' capabilities when specified in
createNetworkOffering and createVpcOffering respectivley
enable ovs plug-in to support both StretchedL2Subnet and RegionLevelVpc
capabilities
make zone id optional parameter in createVpc, zone id can be null only
if vpc offfering supports region level VPC
in region level vpc, let the network/tier to be created in any zone of
the region
keep zoneid as required param for createVpc
skip external guest network guru if 'Connectivy' service is present in
network offering
fix build break in contrail manager
permit VM's to be created in different zone that in which network is
created if the network support streched L2 subnet
add integration tests for region level VPC
rebase to master
Conflicts:
setup/db/db/schema-430to440.sql
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
engine/schema/src/com/cloud/network/vpc/VpcVO.java
setup/db/db/schema-430to440.sql
2014-03-20 16:32:22 +05:30
Kelven Yang
ce1e53f451
Fix style-check issue after cherry-picks
2014-03-18 17:00:08 -07:00
Kelven Yang
d9506d2a05
Let VMSync be aware of HA take-over on VM state management.
2014-03-18 16:45:45 -07:00
Kelven Yang
de252adadf
avoid mysql lock-promotion situation.
2014-03-18 16:45:02 -07:00
Nitin Mehta
5d19a936a2
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
...
Work done for network offering.
2014-03-18 14:00:55 -07:00
Nitin Mehta
7442b56fa8
CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature
...
And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well
2014-03-18 14:00:25 -07:00
Daan Hoogland
8b510d2481
checkstyle: unused import
2014-03-18 13:18:57 +01:00
Daan Hoogland
e7e4753979
checkstyle: trailing spaces
2014-03-18 12:35:10 +01:00
edison
ed9ed446c2
CLOUDSTACK-5432: potential bugs in case of stop mgt server while
...
template is downloading, template_store_ref has leftover not in ready
state, when create vm from that template, the code doesn't check either
zone id, nor template_store_ref state.
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
2014-03-18 12:20:14 +01:00
Marcus Sorensen
d638d04cbf
CLOUDSTACK-6181: Merge of resize root feature (resize-root branch)
2014-03-14 07:17:33 -06:00
Min Chen
ae1d6a771b
Remove IAMEntityType to use existing VO interface class to annotate
...
entityType.
2014-03-17 17:19:55 -07:00
Alena Prokharchyk
479986e52b
Fixed compilation error in StorageAllocatorTest.java
2014-03-17 09:58:44 -07:00
Mike Tutkowski
d55c4dd804
CLOUDSTACK-6170
2014-03-14 23:47:20 -06:00
Kelven Yang
5e4a4e8b34
Fix a regression that caused API job to return prematurely.
2014-03-14 17:31:16 -07:00
Kelven Yang
ec01791936
Fix the missing java imports from automatic merge
2014-03-14 14:22:23 -07:00
Kelven Yang
12f7cbcb76
Deal with concurrent state update for VM and Host objects.
2014-03-14 14:07:39 -07:00
Jayapal
384eeaf792
CLOUDSTACK-2692 Assigning LB rule for vm nic secondary ips
2014-03-14 22:47:17 +05:30
Hugo Trippaers
774739fb97
Fix database upgrade from 4.4.0 to 4.5.0
2014-03-14 17:14:57 +01:00
Hugo Trippaers
4402685e11
Update master to 4.5.0-SNAPSHOT
2014-03-14 14:55:26 +01:00
Saksham Srivastava
48f8a95b06
CLOUDSTACK-6092: Storage OverProvisioning as a Per Primary Basis Allow storage.overprovisioning.factor to be specified at storape pool level.
...
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-03-14 12:16:46 +05:30
Murali Reddy
e487b24bb6
couple of bug fixes
2014-03-14 16:56:38 +05:30
Murali Reddy
3139b35518
mark VPC to be using distributed router if VPC offerign supports
...
distributedrouter capability.
2014-03-14 16:56:35 +05:30
Murali Reddy
7c4443e233
-introduces 'DistributedRouter' as capability to 'Connectivity' service.
...
-create VPC offering to permit 'DistributedRouter' as capability to
connectivity service
2014-03-14 16:56:35 +05:30
Devdeep Singh
2aff39f8c7
CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared
...
storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively.
2014-03-14 16:27:58 +05:30
Koushik Das
f293c94bc0
CLOUDSTACK-6090: Virtual Router Service Failure Alerting
...
Fixed a missing license header
2014-03-14 15:45:54 +05:30
Harikrishna Patnala
f7337527cf
CLOUDSTACK-6090: Virtual Router Service Failure Alerting
...
Signed-off-by: Koushik Das <koushik@apache.org>
2014-03-14 15:14:15 +05:30
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
8ff94601f1
Merge branch 'rbac' to master
2014-03-13 16:42:22 -07:00
Alena Prokharchyk
6c23e201ad
1) More fixes for the problems found by findBugs
...
2) Corrected some logging in MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
2014-03-13 16:05:45 -07:00
Min Chen
84a528fad6
Merge branch 'master' into rbac
2014-03-13 14:52:37 -07:00