Commit Graph

214 Commits

Author SHA1 Message Date
Nitin Mehta ce90837357 CLOUDSTACK-6826: Improving the download url expiration where the expiration work would be handled by the ssvm that has the corresponding symlink created on it. In case it doesnt exist, then would be any one of the ssvm in the zone.
Also when the ssvm is destroyed all the download urls are expired to be cleaned up in the next run by the new ssvm.
2014-10-10 16:28:48 -07:00
Anthony Xu 847e1e47ae when system VM ping times out, stop system VM 2014-09-30 12:35:44 -07:00
Hugo Trippaers dc3f0cbc63 Improve the handling of the findbug exclude files 2014-09-03 10:41:22 +02:00
Min Chen 902a9c5b70 CLOUDSTACK-7266: Deleting account is not cleaning the snapshot entries
in secondary storage.
2014-08-25 16:09:48 -07:00
Kishan Kavala c09888fcb5 CLOUDSTACK-7237 : Added TAR image processor for templates with tar extension 2014-08-06 18:03:02 +05:30
Santhosh Edukulla b371356abc Fixed coverity issues reported 2014-07-31 21:19:57 +05:30
Hugo Trippaers 49f60ca744 Fix a coverity issue about unchecked returns and make the code flow a
litle bit more easy to follow.
2014-07-28 14:42:42 +02:00
Hugo Trippaers 885e08d476 Fix CID 1114611 Check the right variable 2014-07-24 12:21:38 +02:00
Hugo Trippaers fc23c70a1f Fix CID 1116481 Widening should happen before calculation 2014-07-04 16:48:30 +02:00
Logan B 736bf540e8 Changed logic for copying snapshot from S3 to NFS staging store to prevent needless failure.
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-06-20 22:37:21 +02:00
Nitin Mehta 8b6dc7ce2f CLOUDSTACK-6824: In case there is a failure to delete the soft link of a download url, dont bail out since there can be cases such as destroy ssvm where the soft links do not exist any more.
(cherry picked from commit 7333016722)
2014-06-02 17:55:09 -07:00
Nitin Mehta 5393387bbd CLOUDSTACK-6599:
1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls
2014-05-30 10:48:42 -07:00
Nitin Mehta 1d45b75298 CLOUDSTACK-6499:
Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL.
2014-04-24 17:27:02 -07:00
Marcus Sorensen 11f5bdd78d CLOUDSTACK-6191 Add support for specifying volume provisioning
type (thin, sparse, fat) in disk/compute offerings.

Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski
2014-04-10 09:23:04 -06:00
edison 8583b70f2a CLOUDSTACK-5828: if snapshot deletion failed, such as can't find it on secondary storage, should return succeed. 2014-03-28 16:22:49 -07:00
Daan Hoogland 8b62b2cb92 findbugs: exclude known spiffy hacks a.k.a. false positives 2014-03-28 14:28:10 +01:00
Hugo Trippaers 4402685e11 Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
John Kinsella 09c375379d CLOUDSTACK-6204: removing realhostip dependency
Moving default transport for console proxy, SSVM to http.

See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes
for more info.

jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.

Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700
2014-03-09 13:46:57 -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
Hugo Trippaers cc6938e3a8 Findbugs : Fix several "of concern" findings. 2014-02-14 18:37:46 +01:00
Alex Huang 54f32a8e46 Moved the controlling logic for secondary storage vm into place 2014-02-05 01:39:17 +00:00
Alex Huang 4be3b99337 Moved the secondary storage service into its own server directory 2014-02-05 01:38:24 +00:00
Hugo Trippaers 8f10dedce9 Fix findbugs findings and remove dead code 2014-01-31 09:37:16 +01:00
Sanjay Tripathi dfe744c4a9 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-30 13:26:00 +05:30
Sanjay Tripathi 1c4bbecc4a CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-29 14:07:59 +05:30
Sanjay Tripathi d7ee7a7431 CLOUDSTACK-5900: Failed to delete template/ISO that failed to download. 2014-01-28 19:21:10 +05:30
Alex Huang 5fb6edd684 Changed the package to name to org.apache.cloudstack 2014-01-09 16:12:26 -08:00
Alex Huang ae8560b195 Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse. 2014-01-09 16:12:25 -08:00
Edison Su 9947e688c4 CS-18564: create template from snapshot failed, due to the volume(the
snapshot created from) is deleted.
2013-12-20 12:45:02 -08:00
Marcus Sorensen 95364a4022 CLOUDSTACK-5531
Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM.
2013-12-16 14:32:51 -07:00
Alex Huang be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Min Chen 5dccaa1832 CLOUDSTACK-5454: Delete previous template and snapshot after migrating
NFS to S3 throws Error.
2013-12-11 16:54:40 -08: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 224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang e4b22d0fca Replace all tabs, particularly the ones in the comments 2013-11-21 03:39:58 -08:00
Alex Huang 8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Darren Shepherd 891b85d516 Add missing licenses 2013-10-23 15:20:08 -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
Min Chen 25acfbad78 CLOUDSTACK-4816:provide configurable option to choose single vs
multipart upload to S3 object storage based on object size.
2013-10-17 10:28:59 -07:00
Hugo Trippaers 71dc43ebb0 Remove duplicate scripts and move the remaining items to the systemvm project 2013-10-14 08:02:35 +02:00
Min Chen f1895ea39a CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable. 2013-10-04 18:21:25 -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 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
Hugo Trippaers 15a97ec412 Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00
Hugo Trippaers 17977b426b Forgot to add a few items to the commit to move the systemvm 2013-09-20 18:52:47 +08:00
Donal Lafferty e958f22ff3 CIFS support for secondary storage is documented here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/CIFS+Support
It was implemented by extending the NFS provider. Its validation was updated so that you can pass it a URL containing the
details of a CIFS share.  The code that mounts NFS shares was extended to allow it do the same for CIFS shares.  Otherwise,
the secondary storage code is left unchanged.
2013-09-11 14:23:29 +05:30
Min Chen b11a8e12e8 CLOUDSTACK-4625:Snapshots and templates should be deleted from staging
storage after create template from snapshot on S3.
2013-09-06 17:48:40 -07:00
Min Chen bf83efcf4b CLOUDSTACK-4190:[Object_store_refactor] volume should be deleted from
staging storage after successfule volume migration, specially handle
DeleteVolume command for Vmware volume structure in secondary storage.
2013-09-06 14:39:03 -07:00
Min Chen 49dd7289c0 CLOUDSTACK-4468:template created from snapshot is destroyed once we
restart management server.
2013-08-26 11:58:53 -07:00
Wido den Hollander a5c10767d6 CLOUDSTACK-4249: Do not assume KVM snapshots are in QCOW2 format
RBD snapshots are in RAW format and are stored as such on Secondary Storage.

When creating a template from such a snapshot, honor the image format passed
down by the management server and act on that.

The old code simply assumed it always was QCOW2.
2013-08-21 17:12:30 +02:00
Edison Su 45b35aaeef CLOUDSTACK-4398: get physical size of template if the template is stored in S3 2013-08-19 17:52:28 -07:00
Min Chen c675f826e5 CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied
to Staging storage during snapshot creation.
2013-08-14 18:12:53 -07:00
Min Chen 67beef15c9 CLOUDSTACK-3706:[Object_Store_Refactor] Failed to create template from
stopped guest vm's root disk.
2013-08-14 13:11:06 -07:00
Kishan Kavala 21831211f6 CLOUDSTACK-4295 : TemplateTO should contain physical size along with virtual size. Usage ignores templates with size 0 2013-08-14 17:34:05 +05:30
Edison Su 1a6b7d6714 CLOUDSTACK-4216: fix extract volume for kvm 2013-08-12 17:20:15 -07:00
Edison Su 9a89fd94fc CLOUDSTACK-4211: fix s3 on kvm 2013-08-12 17:20:09 -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
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Donal Lafferty 25fa21f190 Get QuickCloud working again
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-08-07 11:22:32 -07:00
Edison Su 36c7a56d12 CLOUDSTACK-4073: fix s3 on vmware
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
2013-08-05 20:23:01 -07:00
Alex Huang 66cca4d9ac Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -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
Min Chen 42da3efbc3 CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code. 2013-07-29 14:31:33 -07:00
Edison Su 86d919eee2 CLOUDSTACK-2481: the wait is in seconds in copycommand 2013-07-25 10:32:14 -07:00
Edison Su 80ac885e22 CLOUDSTACK-2304: fix migrate volume for vmware 2013-07-24 19:06:42 -07:00
Min Chen 44cae46014 CLOUDSTACK-3741: generate template.properties so that KVM processor will
not fail with FileNotFound.
2013-07-24 17:51:28 -07:00
Min Chen 7799f6482f CLOUDSTACK-3741: a typo in adding .qcow2 extension. 2013-07-24 14:53:00 -07:00
Min Chen df452ba13a CLOUDSTACK-3741:Object_Store_Refactor - [KVM] Creation of Template from
Snapshot Fails.
2013-07-24 09:49:28 -07:00
Edison Su d22bea6031 CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:59 -07:00
Edison Su be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -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
Edison Su bf32776f9f be able to upload template into swift 2013-07-16 18:07:06 -07:00
Min Chen 9f019ec7c3 CLOUDSTACK-2497: Object_Store_Refactor - Snapshots - Not able to delete
snapshots.
2013-07-16 14:42:29 -07:00
Edison Su 8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Edison Su 0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Wei Zhou 521dcbdcc0 CLOUDSTACK-1475: fix RegisterISO error after Update SSL Certificate 2013-07-11 16:08:26 +02:00
Edison Su e8b0cff1c6 CLOUDSTACK-2658: timeout can't be null 2013-06-14 18:26:20 -07:00
Min Chen 04b5f53392 Removed unused code handling for DeleteSnapshotBackupCommand since we
don't send that command anymore.
2013-06-07 17:55:05 -07:00
Min Chen 83b080c4b3 Fix a path bug in s3ListTemplate and s3ListVolume, path should include
filename.
2013-06-07 16:48:47 -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 c78f3984fe Fix a bug in copyFromS3ToNfs code about path. 2013-06-06 14:06:26 -07:00
Min Chen ef03d5a122 Move data store specific extract template/iso logic from
TemplateManager to data store driver.
2013-06-04 11:50:43 -07:00
Min Chen 8a1a51c6fc Clean up deleteSnapshot agent command, since snapshot path is already
stored in snapshot_store_ref, no need to construct path in resource
side.
2013-05-28 13:36:54 -07:00
Min Chen 27133fba7d Simplify clean up snapshots logic in secondary storage and consolidate
to use one agent command DeleteSnapshotBackupCommand for snapshot
deletion task by removing CleanupSnapshotBackupCommand.
2013-05-25 20:48:15 -07:00
Edison Su 0ed441c690 CLOUDSTACK-2637: fix upload volume 2013-05-24 19:00:52 -07:00
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Min Chen 039098469a CLOUDSTACK-2584: set Format value in CopyCommand. 2013-05-22 14:33:40 -07:00
Edison Su 5af888c67a add image format in volumevo 2013-05-22 13:38:11 -07:00
Rajesh Battala 11f85c9c9e CLOUDSTACK-2398: ssvm-check.sh failed with permission error
RPCbind service is running in the 4.2 systemVMs resulting in ssvm-check
trying to write to the mountpoint. Avoid writing to the rpc_pipefs.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-22 13:58:36 +05:30
Edison Su 827a1a229b CLOUDSTACK-2584: fix create template from s3 2013-05-21 16:55:41 -07:00
Min Chen a4e6784e0b CLOUDSTACK-2578: NPE in deleting template from S3. 2013-05-21 14:43:32 -07:00
Min Chen 84607c1e53 Fix CLOUDSTACK-2537: Use mount.parent configured value to mount NFS
cache on MS to avoid permission issue.
2013-05-17 17:49:58 -07:00
Min Chen b66c484905 Fix size issue in copying template from S3 to cache storage to make
system vm up.
2013-05-15 18:54:55 -07:00
Edison Su 879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Edison Su 0ce01e56db set template size when creating template from snapshot 2013-05-13 16:45:03 -07:00
Edison Su a7480530f7 fix RAT 2013-05-13 16:22:46 -07:00
Min Chen 0b9e0c0f3a Override getRootDir in LocalNfsSecondaryStorageResource to make mount
successfully on MS side. Now S3 is working.
2013-05-12 17:41:44 -07:00
Min Chen fdb523d219 Remove a debug code. 2013-05-12 00:01:44 -07:00
Min Chen 1bd216fc48 Merge with latest code rebased from master 2013-05-11 21:05:54 -07:00
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
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
Alex Huang 3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Alex Huang 074df0b415 Fixed an incorrect unit test for affinity group. Removed some useless pom.xml. 2013-05-06 16:34:26 -07:00
Alex Huang f6913b5088 Removed files that are no longer used and further separated out the files in the core project 2013-05-06 16:34:21 -07:00
Marcus Sorensen 7fa57922a4 Detail: Delete KVMHA dir contents if found when deleting templates, volumes
from Nfs Secondary storage

BUG-ID: CLOUDSTACK-2173
Bugfix-for: 4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1366838425 -0600
2013-04-24 15:20:25 -06:00
Chiradeep Vittal 2e6c65fd34 QuickCloud: sanitize logs for normal running of agents outside systemvm 2013-04-09 14:45:27 -07:00
Chiradeep Vittal 778a59fbf6 QuickCloud: move devcloud configuration into pom profile for exec:java
Also ignore agent.properties in RAT since
a. they are trivial
b. they are modified by the java code (stripping the license)

QuickCloud: proper path for log.home

QuickCloud: proper path for secstorage.sh
2013-04-09 14:45:26 -07:00
Chiradeep Vittal 936973aff7 QuickCloud: launch scripts for secondary storage and console proxy outside system vm
QuickCloud: remove stuff added by the daemon
2013-04-09 14:45:26 -07:00
Chiradeep Vittal c5b11df6b7 QuickCloud: option to build with componentContext tailored for quickcloud
For now it replaces ConsoleProxyManagerImpl with StaticConsoleProxyManager
Usage: mvn install -Dquickcloud

QuickCloud: rename deploy profile

QuickCloud: remove cyclic dependency introduced in nonoss build by moving SecondaryStorageDiscoverer into services
However with this fix, developers will be unable to run 'PremiumSecondaryStorageResource' (for VMWare installations) using mvn exec:java.
Instead they will have to use the exploded archive from systemvm.zip
2013-04-09 14:45:26 -07:00
Chiradeep Vittal e7983b25cc QuickCloud: Enable secondary storage daemon to run outside the system vm 2013-04-09 14:45:25 -07:00