Alex Huang
ab37009e90
Revert "CLOUDSTACK-5281:"
...
This reverts commit 6b62a04eaf1196ebcce5e81c29c9e0f59dd4f858.
2013-12-20 17:23:33 -08:00
Alex Huang
c2baed665b
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
2013-12-20 17:21:34 -08:00
Nitin Mehta
6b62a04eaf
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -08:00
Nitin Mehta
f083f91b0b
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
Alena Prokharchyk
1832cf6660
CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet.
2013-12-20 13:39:13 -08:00
Edison Su
e52a4d9306
CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
...
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
2013-12-20 12:36:30 -08:00
Edison Su
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00
Edison Su
0824c78761
CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)
...
Conflicts:
engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
Conflicts:
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
2013-12-19 14:17:30 -08:00
Edison Su
8caf52c6bc
add xenserver 6.2.0 hotfix support, to optimize vdi copy
...
add xenserver hot fix
Conflicts:
api/src/com/cloud/vm/VirtualMachineName.java
core/src/com/cloud/host/HostInfo.java
core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
deps/XenServerJava/src/com/xensource/xenapi/VDI.java
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
Edison Su
c40d03b417
CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table
...
Conflicts:
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java
engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
2013-12-19 14:01:20 -08:00
edison su
a3fade86b2
Fix snapshot details dao
2013-12-19 13:35:08 -08:00
Kishan Kavala
29b90e7a5c
CLOUDSTACK-5208: upgrade from 3.0.6 to 4.3 is not throwing any exception if new System VM template is not registered with proper name Commit ae231444bc885ee5e9a5d4bb3003bef651c849d6 Commented the exception.
2013-12-19 16:17:37 +05:30
Harikrishna Patnala
707da55fe3
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.
...
Moved both parameters to VolumeOrchestrationService using ConfigDepot
2013-12-19 16:03:27 +05:30
Koushik Das
f2fab9d5b1
CLOUDSTACK-5458: cpu speed is not getting updated in vm_instance table after service offeirngs change
...
Removed cpu, ram and cpu speed fields from the vm_instance table as these are not used
2013-12-19 14:15:39 +05:30
Nitin Mehta
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Kelven Yang
3c965d0685
CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations
2013-12-18 16:14:07 -08:00
Min Chen
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771.
2013-12-18 16:01:37 -08:00
Min Chen
bb91b739a8
CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.
2013-12-18 15:44:00 -08:00
Nitin Mehta
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Antonio Fornie
55a6df4501
Resources leaks, refactoring and testing
...
Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)
Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)
Create Unit and Integration Tests for UsageSanityChecker
Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests
2013-12-18 10:55:04 +01:00
Prachi Damle
6d6d11f7a4
CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs
...
Changes:
- Removing the trailing spaces in the file
2013-12-17 14:55:59 -08:00
Prachi Damle
78e4dd8566
CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs
...
Changes:
- The vmprofile owner passed in to the planner should be the VM's account and not the caller
- Do not do the access check for Root Admin
Conflicts:
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
2013-12-17 14:55:56 -08:00
Kelven Yang
719271b1d9
Fix tab and trailing spaces
2013-12-16 15:15:30 -08:00
Kelven Yang
9d3827e6fe
CLOUDSTACK-669: refactor VM work job dispatcher to allow volume/snapshot manager to participate serialized job handling
2013-12-16 15:15:30 -08:00
Murali Reddy
c6c2995231
CLOUDSTACK-4616: When system Vms fail to start when host is down , link
...
local Ip addresses do not get released resulting in all the link local
Ip addresses being consumed eventually.
fix ensure Nics with reservation strategy 'Start' should go through
release phase in the Nic life cycle so that release is performed before
Nic is removed to avoid resource leaks.
2013-12-16 19:05:35 +05:30
Min Chen
46d1e1afb2
CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is
...
brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached".
2013-12-13 22:04:29 -08:00
Rajani Karuturi
b54ac9a635
CLOUDSTACK-5483 : Failed to start management server when db
...
encryption is enabled When db encryption is enabled, the server expects all
secure,hidden fields in encrypted form. moved the insert statements which has
dafault values to java and populated encrypted values if encryption is
enabled.
2013-12-13 17:44:24 +05:30
Jayapal
bd54ed8071
CLOUDSTACK-5417 Updating egress firewall rules CiDR on external network restart
2013-12-13 14:45:44 +05:30
Alena Prokharchyk
9df10718e4
Resource metadata support for S2SVpnConnection
...
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
setup/db/db/schema-421to430.sql
2013-12-12 16:39:02 -08:00
Alex Huang
cf0a11e45a
pull merges
2013-12-12 13:00:26 -08:00
Alex Huang
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
Alena Prokharchyk
9a21afb50b
Resource metadata support for customer gateway
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-12-12 10:16:30 -08:00
Alena Prokharchyk
cf84733f8b
Resource metadata support for Site2SiteVpnGateway
...
Conflicts:
setup/db/db/schema-421to430.sql
2013-12-12 10:15:36 -08:00
Antonio Fornie
e08f64e6ae
Fix several Resource Leak issues related to not closed PStmts and ResultSets
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 13:24:22 +01:00
Kelven Yang
26c1ba296c
CLOUDSTACK-669: put user vm work under new vmsync model
2013-12-11 16:29:59 -08:00
Min Chen
df1c34bf2b
CLOUDSTACK-5451:Restart MS after migrating NFS image store to S3,
...
previous Ready template is not ready anymore.
2013-12-11 14:18:06 -08:00
Min Chen
010b007ee4
CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown
...
in creation of Virtual Router.
2013-12-11 14:17:43 -08:00
Jayapal
5c12250dea
CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX
...
1. Egress default policy rules is send to the firewall provider. It is up to the
provider to configure the rules.
2. The default policy rules are send for both allow and deny default policy.
3. On network shutdown rules for delete are send.
4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required.
2013-12-10 14:19:03 +05:30
tuna
d910b42339
fix bean error
2013-12-10 11:30:55 +07:00
tuna
5e23f00b1a
add Apache Licensed and add check native
2013-12-10 10:37:29 +07:00
tuna
f355359b23
fix issues
2013-12-10 10:37:28 +07:00
tuna
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07:00
tuna
4de09ee654
add Apache Licensed
2013-12-10 08:37:37 +07:00
Murali Reddy
be67f5d17a
CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB
...
service and not used for LB
Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider.
2013-12-10 06:20:58 +05:30
Nitin Mehta
e79350d256
CLOUDSTACK-3664:
...
scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check
2013-12-09 15:40:17 -08:00
tuna
7efab20300
fix staticNat after rebase
2013-12-09 23:33:15 +07:00
tuna
4d0602175c
refactor ovsProvider to new resource
2013-12-09 23:33:15 +07:00
tuna
d935d3865a
tuna
2013-12-09 23:33:14 +07:00
Kelven Yang
aa72b76aec
CLOUDSTACK-669: put system vm work under new vmsync model
2013-12-06 16:53:11 -08:00
Prachi Damle
eb7cd06e19
CLOUDSTACK-5401: VM migration during host maintenance fails if pool.storage.capacity.disablethreshold is lowered
...
Changes:
- During Vm migration while finding a new host within the cluster, we need to set the storagepool Id to the deployment plan too.
- This will indicate the planner that the volumes are ready and no need to find new pool
- This in turn will prevent the threshold check done during the pool allocation. This step is not needed since there is no need to allocate pools newly.
- Thus the migration wont fail because th threshold check fails.
2013-12-06 11:18:28 -08:00