etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,564 Commits 334 Branches 327 Tags 842 MiB
Commit Graph

175 Commits

Author SHA1 Message Date
Anthony Xu 90fe6d8087 removed trailing space 2014-08-13 11:09:38 -07:00
Anthony Xu 330c4ba578 completed the new vmsync TODOs in the code. 
removed old vmsync logic
 2014-07-28 12:51:37 -07:00
amoghvk 33d6bc278f Adding missing modified file 2014-07-14 17:42:27 -07:00
amoghvk 62e63a1bf7 CLOUDSTACK-6358: Missing patches in master for VMware 2014-07-14 16:54:10 -07:00
amoghvk 6831ed4026 CLOUDSTACK-6358: Missing patches in master branch 2014-07-14 15:17:58 -07:00
Daan Hoogland c79ab570b0 Revert "CLOUDSTACK-6967: Initial OVM3 drop" 
This reverts commit 8a485b9b59.
 2014-06-24 10:24:01 +02:00
Funs 8a485b9b59 CLOUDSTACK-6967: Initial OVM3 drop 
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e25)

Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js
 2014-06-23 12:39:10 +02: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
Min Chen ae1d6a771b Remove IAMEntityType to use existing VO interface class to annotate 
entityType.
 2014-03-17 17:19:55 -07:00
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
Prachi Damle f41604fc6c Renaming AclEntityType --> IAMEntityType 2014-02-25 16:43:17 -08:00
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Nitin Mehta 86cada3b3c CLOUDSTACK-2932: 
Allow deleting of snapshots that have errored out. Simply mark the removed column as there is no physical clean up required. It can land into error state only from allocated/Creating state
 which are states before creation on primary storage works
 2014-02-05 17:34:48 -08:00
Min Chen 9b21da65d1 CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after 
migarting to S3 datastore.
 2014-02-04 11:01:51 -08:00
Min Chen b35eb04de3 CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root 
volume with S3 as secondary storage.
 2014-02-03 12:16:19 -08:00
Min Chen 929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Min Chen 3223028fd6 CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be 
used cross-zone.
 2014-01-08 17:43:06 -08:00
Sanjay Tripathi 3ad0e8fb47 CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table. 2014-01-06 11:36:43 +05:30
Likitha Shetty e659751a8a CLOUDSTACK-5508. Vmware - When there are multiple secondary stores, the newly added secondary store is not being selected for backing up snapshots. 
If the snapshot being backed up is a a delta snapshot, pick the image store where the parent snapshot is stored. Otheriwse pick a random image store.
 2013-12-24 17:34:19 +05:30
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
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
Prachi Damle 7c6f1c14c2 ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and 2013-12-12 16:31:00 -08:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Wei Zhou 81c07f1791 allow delete snapshot with ERROR state 2013-11-28 10:48:07 +01:00
Alex Huang 433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Hugo Trippaers cf715ff491 Bump 4.3.0 to 4.4.0 in master 2013-11-21 16:01:15 +01:00
Alex Huang d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Edison Su 1292b76c63 Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage. 
And also add a new table: snapshotdetails
 2013-11-14 15:55:39 -08:00
Edison Su 4815b024bf Add quiesce vm for vmware during vm snapshot 2013-11-08 15:47:11 -08:00
Edison Su c233492bfc Add quiencevm option on createsnapshotcmd 2013-11-07 14:57:05 -08:00
Edison Su 918bc74050 fix compile 2013-11-01 16:16:03 -07:00
Edison Su 7c99b88926 Don't use cast to PrimarydataStoreTO on the resource code 2013-11-01 15:13:16 -07:00
Edison Su b704d5b8d3 add quiesceVm vm helper function 2013-10-31 16:24:48 -07:00
Min Chen 6be228a438 CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary 
storage to S3.
 2013-10-28 21:01:31 -07:00
Laszlo Hornyak 7902315287 build fix 
Failing VMSnapshotStrategyTest was missing db.properties

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-10-26 17:34:00 +02:00
Edison Su 70b2c0150d rebase to spring changes 2013-10-25 18:15:36 -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
Darren Shepherd c9101966e0 Added StorageStrategyFactory to centralize and deduplicate some logic 2013-10-23 12:40:41 -07:00
Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96' 
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2013-10-23 12:31:53 -07:00
Chris Suich 0ed7ebd7e7 Squashed & merged commit of the following: 
commit c9ee0d12e191e803fb341f3f96e95ca434a36f6c
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Wed Oct 23 16:55:10 2013 +0200

    CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
    (cherry picked from commit a94acc5a43)

commit fe1586c71377bc6d219db2dcf088c40b65dd1fc4
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Tue Oct 22 11:20:27 2013 -0700

    CLOUDSTACK-4649:
            vm sync tracks the pv driver version for xenserver

     Anthony

commit 56a218f66eda540b4b4b04030ee71fc6863f8532
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Mon Oct 21 16:10:07 2013 -0700

    CLOUDSTACK-4649:
        xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
    this patch tracks PV driver versions in vm details and template details.

    Anthony

commit 4e85d28c678a6f96b5b70d8d33fc60f9d1ea3df6
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Date:   Mon Oct 21 21:17:33 2013 +0200

    removed unused static field

    - s_httpClientManager was not used

    Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>

commit d4121fa26023db236f7396cea455ef090672ae9a
Author: Chris Suich <chris.suich@netapp.com>
Date:   Tue Oct 22 10:45:22 2013 -0400

    Updated DataMotionServiceImpl and ApiResponseHelper based on review feedback.

commit aaf026e1e4204d405bcda2ae4f1a01b1d0f7e7cb
Author: Chris Suich <chris.suich@netapp.com>
Date:   Thu Oct 17 14:27:12 2013 -0400

    Added context to strategy sorting error responses
    Added TODOs for DRYing out pickStrategy() overloading

commit a221f4aa3fb2ddc255bc35cf753f98f88f5bf44e
Author: Chris Suich <chris.suich@netapp.com>
Date:   Wed Oct 16 09:57:28 2013 -0400

    Updated inefficient strategy sorting/selection
    Removed unnecessary canRevertSnapshot from PrimaryDataStoreDriver
    Other general cleaup and fixes from reviews

commit 7d58949c6a1b7e853e891b59387a9620e8cd7a91
Author: Chris Suich <chris.suich@netapp.com>
Date:   Mon Oct 14 14:01:22 2013 -0400

    Added volume snapshot revert capability to SnapshotResponse
    Updated UI to hide/show snapshot revert action per snapshot

Signed-off-by: Edison Su <sudison@gmail.com>
 2013-10-23 12:21:43 -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
Chris Suich aad1cda7e0 Added categorized sorting to SnapshotStrategy and DataMotionStrategy 2013-10-14 15:20:42 -07:00
Chris Suich 350c94474b Updates to revertSnapshot API Added revertSnapshot API action to UI 2013-10-14 15:19:51 -07:00
Chris Suich 180cfa19e8 Refactor Storage Related Resource Code 
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)

Signed-off-by: Edison Su <sudison@gmail.com>
 2013-10-04 13:06:42 -07:00
Darren Shepherd c9a9a3b7b3 Make SnapshotStrategy and DataMotionStrategy discovered and registered 2013-10-03 17:03:28 -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
Alex Huang e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Edison Su 9baa45308c CLOUDSTACK-4650: change volume state during snapshot only 2013-09-25 16:33:10 -07:00
Edison Su aa59b6f34d CLOUDSTACK-4507: fix NPE when taking snapshot 2013-09-25 16:09:00 -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
Kelven Yang 281b94d587 CLOUDSTACK-4458: Volume attach/detach command needs to sent to hypervisor resource even when target VM is in Stopped state 2013-09-04 14:49:46 -07:00
Kelven Yang e3a5b3fad9 CLOUDSTACK-3237: acknowledge the behind-back VMDK disk consolidation happend in vCenter after storage live migration 2013-09-04 14:49:46 -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 374de76dae CLOUDSTACK-4324: need to clean up snapshot_store_ref, if creating snapshot failed. 2013-08-14 14:59:19 -07:00
Alex Huang de2bd96d98 Moved volume related code into cloud-engine-orchestration 2013-08-12 19:06:51 -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
Koushik Das 12ba37c8af CLOUDSTACK-4136: [upgraded ENV]Deleting Snapshot which was created before upgrade is throwing NPE. 
Snapshot object is being accessed even when it is null. In case snapshot is not present in backup store the code should return after cleaning db entry.
Also noticed discrepancy in the upgraded db setup but couldn't fully verify it, so added logging in the upgrade logic for template/snapshots etc.
 2013-08-08 15:13:08 +05:30
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
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -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
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
Edison Su 6ea9d8b159 CLOUDSTACK-3976: if the snapshot is empty and it's the last one in the chain, we need to take full snapshot for the snapshots in sequence 2013-07-31 17:43:49 -07:00
Edison Su 06b9976371 CLOUDSTACK-3976: delete parent snapshot if child snapshots are deleted 2013-07-31 17:03:27 -07:00
Alex Huang c2752ba93c Removed mysql as any dependency 2013-07-26 20:35:48 -07:00
Alex Huang 1834e81476 Added the missing directories 2013-07-26 16:34:09 -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
Edison Su 5e427bd2f6 CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4 2013-07-25 16:36:06 -07:00
Edison Su d22bea6031 CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:59 -07:00
Edison Su fa358cf01f CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:41 -07: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
Edison Su c2da4eac89 fix NPE for cache ref cnt 2013-06-14 17:24:31 -07:00
Edison Su a715eb8121 clean up storage related code, and add lru replacement algorithm for cache storage 2013-06-14 15:55:59 -07:00
Min Chen 66e702222d Simplify various DeleteTemplateCommnad, DeleteVolumeCommand and 
DeleteSnapshotBackupCommand to use one DeleteCommand, also provide
BaseImageStoreDriverImpl class for plugin to inherit to avoid code
duplication.
 2013-06-06 18:00:38 -07:00
Min Chen eb93efdaa4 Add convenient delete methods in DataObject to delete dangling data 
object.
 2013-05-30 14:51:03 -07:00
Edison Su 0a5228922b clean up storage related coded 2013-05-29 18:04:37 -07:00
Min Chen 8960957605 CLOUDSTACK-2634:all delta snapshots relating to volume should be created 
in the same secondary storage as the first snapshot.
 2013-05-23 10:45:47 -07:00
Min Chen 8f549db518 Clean up entries in template_store_ref, volume_store_ref and 
snapshot_store_ref in case of operation failure.
 2013-05-21 12:00:04 -07:00
Min Chen 2f6d94462e Support multiple secondary storages for backup snapshot. 2013-05-20 21:36:50 -07:00
Edison Su 879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Edison Su 492127c035 fix kvm 2013-05-12 18:27:37 -07:00
Alex Huang 342624e0eb Merged with head 2013-05-10 16:33:57 -07:00
Alex Huang 3047929367 Merged 2013-05-10 16:21:43 -07:00
Edison Su 15fc4e137d add license header 2013-05-10 11:40:11 -07:00
Edison Su 42e25a22fc refactor kvm/vmware resource code 2013-05-09 23:10:05 -07:00
Edison Su 9f7bad2cef fix creating snapshot 2013-05-06 18:27:15 -07:00
Edison Su 2d544e7127 volume related operation works 2013-05-06 18:27:15 -07:00
Min Chen c60c373a38 Modify DownloadCommand to pass DataTO. 2013-05-02 23:05:19 -07:00
Edison Su 52799f46a4 fix data motion 2013-05-01 14:00:53 -07:00
Edison Su 2f689171e0 refactor snapshot 2013-04-29 18:51:14 -07:00
Edison Su 37cbe8890f refactor snapshot 2013-04-29 18:51:13 -07:00
Min Chen 4c174a6867 Fix DeleteSnapshotBackupCommand to pass dataStore information. 2013-04-24 17:30:38 -07:00
Min Chen 8d29cdf804 Remove SnapshotVO.getSecHostId and SnapshotVO.setSecHostId references 
from codebase to use SnapshotDataStoreVO.
 2013-04-24 11:54:42 -07:00
Min Chen 29687663e8 Rename SnapshotStrategy to SnapshotService to have consistent naming 
convention for Template, Snapshot, Volume. Also rename CopyCmd to
CopyCommand to follow internal command naming convention.
 2013-04-22 16:15:57 -07:00
Min Chen fe3b01ece1 Update DataObjectInStore interface and unify implementation of 
ImageDataFactory, VolumeDataFactory and SnapshotDataFactory
implementations.
 2013-04-17 11:40:57 -07:00