Commit Graph

177 Commits

Author SHA1 Message Date
Min Chen 5ec2a44ce9 Rebase with latest master. 2013-10-28 20:51:34 -07:00
Edison Su 51a8086cf6 Merge branch 'pluggable_vm_snapshot'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/resources/storageContext.xml
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
2013-10-25 16:47:17 -07:00
Edison Su a6ce66e55a move a lot of code into vmsnapshot strategy
fix compile

fix compile

add vm_snapshot_details table in db

add vmsnapshot test cases
2013-10-25 15:09:04 -07:00
Min Chen 7a1ee00275 Merge branch 'master' into object_store_migration. 2013-10-23 16:46:28 -07:00
Min Chen 730832d8fa Delete cache entries of template, snapshot, and volume when
deleteTemplate, deleteSnapshot, deleteVolume are invoked.
2013-10-23 14:05:05 -07:00
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Nitin Mehta 17dd9a832b CLOUDSTACK-3737:
Delete the uploaded volume once its copied successfully to the primary storage.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-21 14:54:42 -07:00
Min Chen ec3302afd6 CLOUDSTACK-3472: [Object_Store_Refactor] System VMs are not coming up in
initial attempt, but they are coming up after multiple attempts.
2013-10-17 15:59:10 -07:00
Darren Shepherd 67186429e1 Spring Modularization
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Edison Su 9baa45308c CLOUDSTACK-4650: change volume state during snapshot only 2013-09-25 16:33:10 -07:00
Edison Su 2227eb191a CLOUDSTACK-3535: fix regression introduced in 5d9fa5d42e 2013-09-25 16:16:34 -07:00
Edison Su a82b179878 add table lock on snapshot, during taking snapshot
Conflicts:

	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
2013-09-25 16:03:59 -07:00
Edison Su b5f7e307a1 CLOUDSTACK-4456:
CLOUDSTACK-4457:
CLOUDSTACK-4459:
harden kvm getvolume. It's possible that one volume created on other kvm host, won't show up on another host, try more times to refresh storage pool if volume won't shown up

Conflicts:

	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
2013-09-25 16:01:45 -07:00
Min Chen 6fccd74ae8 CLOUDSTACK-4534:[object_store_refactor] Deleting uploaded volume is not
deleting the volume from backend.
2013-09-17 15:20:20 -07:00
Min Chen a20097b967 CLOUDSTACK-4534:[object_store_refactor] Deleting uploaded volume is not
deleting the volume from backend.
2013-09-11 10:25:57 -07:00
Nitin Mehta 654c90f4e5 CLOUDSTACK-4327:
Check for the all the transition states for Maintenance. Also corrected the isMaintenance function for StoragePoolVo
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-09-05 12:43:36 +05:30
Min Chen b0fc3114f4 Fix build error. 2013-08-28 12:18:21 -07:00
Min Chen 6a9caf7487 CLOUDSTACK-4430:[Automation][vmware] Failed to deploy vm, if one host is
down in a cluster.
2013-08-28 11:52:06 -07:00
Edison Su 4fd09cb344 CLOUDSTACK-4324: delete snapshot_store_ref, if create snapshot failed on primary storage 2013-08-19 15:26:18 -07:00
Edison Su 0040c4adef CLOUDSTACK-4363: fix possible NPE, if copy volume failed. 2013-08-19 15:25:20 -07:00
Min Chen 3937a7b5a5 CLOUDSTACK-4400:[object_store_refactor] Three entries for one template
in template_store_ref when MS was restarting during template download.
2013-08-19 15:01:57 -07:00
Edison Su 81fedcfa3e CLOUDSTACK-4338: catch up exception in case of deleting volume in parallel: it's possible that two threads can delete one volume at the same time, if the volume state is in Expunging 2013-08-14 18:16:08 -07:00
Wido den Hollander 04f378bcff CLOUDSTACK-4114: Use RAW disk images for RBD instead of QCOW2 2013-08-13 16:14:45 +02:00
Hugo Trippaers d57796b94f Fix XML validation errors 2013-08-13 08:25:45 +02:00
Nitin Mehta ab5ea3febd CLOUDSTACK-4133
Introduce a global lock on template and pool id so that concurrent threads wont be inserting the same row in DB and hit MySQLIntegrityConstraintViolationException
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-08-09 14:03:43 +05:30
Min Chen bf6961255a CLOUDSTACK-4190:[Object_store_refactor] volume should be deleted from
staging storage after successfule volume migration .
2013-08-08 16:16:36 -07:00
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefc.
2013-08-08 15:02:40 -07:00
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Edison Su e851f4a930 CLOUDSTACK-4109: fix upload volume to s3 for vmware 2013-08-07 19:14:18 -07:00
Min Chen 98041dba46 CLOUDSTACK-4109:[Object_store_refactor] Extract volume failed with NPE. 2013-08-07 17:11:40 -07:00
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Edison Su a8ee45de7c CLOUDSTACK-4074: if hypervisor doesn't return size of volume/template, don't update it into db 2013-08-06 15:53:57 -07:00
Min Chen ec89e23665 CLOUDSTACK-4116: don't update db if hypervisor storage processor does
not return volume size.
2013-08-06 15:42:18 -07:00
Min Chen a8990cffd4 CLOUDSTACK-4003: We should not delete a READY data object from object
store ref table in case of any operation failure related to this data
object.
2013-08-06 15:04:57 -07:00
Edison Su 239c6cef45 CLOUDSTACK-4008: fix snapshot npe if its volume is deleted 2013-08-01 13:59:41 -07:00
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Min Chen c2192808aa CLOUDSTACK-3686: Registering a template does not generate a usage event. 2013-07-30 17:35:12 -07:00
Alex Huang c2752ba93c Removed mysql as any dependency 2013-07-26 20:35:48 -07:00
Alex Huang 3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Koushik Das deb701b7e0 CLOUDSTACK-3493: [storage ref] Attach volume to VM is failing in case of Primary-Localstorage .
Some existing scenarios for root and data volume combination was not working. These are
a. Local root + Shared data
b. Shared root + Local data

Enabled these scenarios as part of this fix
2013-07-25 17:10:20 +05:30
Edison Su be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Min Chen 956e8301c2 CLOUDSTACK-3716: State of expunged volumes are not consistent in volumes
table and volume_store_ref.

Conflicts:
	server/src/com/cloud/storage/VolumeManagerImpl.java
2013-07-23 15:06:34 -07:00
Min Chen cc99a83d71 CLOUDSTACK-3716:NPE triggered in DownloadListener. 2013-07-22 17:26:33 -07:00
Min Chen 181fb03e7e CLOUDSTACK-3716:NPE triggered in DownloadListener 2013-07-22 17:14:30 -07:00
Min Chen f8b5a4159b CLOUDSTACK-3419: [Object_Store_Refactor] Uploaded volume is being
deleted while attaching it to guest VM.
2013-07-20 12:16:55 -07:00
Vijayendra Bhamidipati 6bad34c509 CLOUDSTACK-3110: [VMWARE]NPE while adding primary storage(scope=cluster) with Invalid hostname
Description:

    When retrieving primary datastore, handle case for non-existing datastores/hosts.
    Throw exception and handle the exception in datastore mgmt layer and pass onward
    to create storage pool API.
2013-07-03 09:43:00 -04:00
Prasanna Santhanam de38cd815f Fix typo in class name
AsyncRpcConext -> AsyncRpcContext

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Min Chen b09f69d917 CLOUDSTACK-3249: [Object_Store_Refactor] Unable to deployVm from
template when the management server was restarted in the middle of
Secondary to Primary storage template download.
2013-06-27 17:36:02 -07:00