Min Chen
621276715a
CLOUDSTACK-6046:CreateVolume from snapshot is failing with S3 as
...
secondary storage and zone-wide primary storage.
2014-02-06 15:36:26 -08:00
Ian Southam
cecb216caa
fixBugs finding
...
fm.equals(format) breaks equals contract
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-06 10:32:06 +01: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
Devdeep Singh
a24263fe81
CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.
2014-02-05 15:44:09 +05:30
Alex Huang
7f34282dfa
Removed references to secondarystoragevmmanager from code that doesn't use it.
2014-02-05 01:39:15 +00:00
Prachi Damle
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -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
Daan Hoogland
ca1b340cef
findbugs make use of return of string manipulation
2014-02-04 11:21:01 +01: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
Hugo Trippaers
d56c5dfc13
Fix for a potential NPE
2014-01-31 09:37:11 +01:00
Min Chen
16a9171f55
Fix trailing whitespace.
2014-01-28 14:53:18 -08:00
Min Chen
a26c81178b
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
...
other zones.
2014-01-28 14:49:58 -08:00
Min Chen
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
Min Chen
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
Min Chen
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
Mike Tutkowski
3ef560d925
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:15:18 -07:00
Alex Huang
68b8891c62
Removed all reminants of the IdentityService. Created the KeysManager to move the management
...
of keys out of management server
2014-01-14 13:11:35 -08:00
Mike Tutkowski
21a44934b4
Removed a duplicate method
2014-01-10 13:36:04 -07:00
Marcus Sorensen
fc082832d3
CLOUDSTACK-5853
...
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.
Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.
First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.
Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).
Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:55:54 -07:00
Mike Tutkowski
ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07: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
Mike Tutkowski
03118c2969
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 14:44:35 -07: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
Min Chen
858b9b1177
CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one
...
zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed.
2014-01-08 17:15:04 -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
Sateesh Chodapuneedi
6ba9754201
CLOUDSTACK-5447 [Automation] Volume migration failing with NullPointerException in vmware and KVM.
...
Instead of injecting object of VolumeOrchestrationService into VmwareResource, we now populate the command object (MigrateVolumeCommand here) with required information. Thus we dont need volume orchestration service to query that information from resource.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-12-31 06:31:43 +05:30
Min Chen
6f800506fd
CLOUDSTACK-5653:S3 object store as Secondary Storage, the template
...
created from different zone is not available for the other zones.
2013-12-26 14:48:21 -08:00
Min Chen
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
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
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
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
Min Chen
bb91b739a8
CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.
2013-12-18 15:44:00 -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
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
Alena Prokharchyk
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -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
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -08:00
Alex Huang
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
Wido den Hollander
1edaa36cc6
CLOUDSTACK-1302: Allow a cache mode per disk offering
...
Per disk offering the setting none, writeback or writethrough can be set
This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
Alex Huang
465626f6d1
Fixed issues with execute in sequence
2013-11-19 17:20:58 -08:00
Hugo Trippaers
bb8f8fb20b
Expose getPrimaryDataStore(String uuid) through the DatastoreManager interface so it can be used clients.
2013-11-18 14:27:06 +01: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
Harikrishna Patnala
53b0bf6733
Template/ISO download fails cause the object to disappear from UI in 4.2
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-11 10:58:43 +05:30
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
Chris Suich
aef633f203
Updated VMSnapshotDetails* to match *Details* pattern (e.g. UserVMDetails*)
...
Signed-off-by: Edison Su <sudison@gmail.com>
2013-11-07 14:28:19 -08:00
Hugo Trippaers
f6f4a93145
Fix CID 1116743 Resource leak
2013-11-07 16:23:20 +01:00
Mike Tutkowski
10c513a259
CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2013-11-06 21:02:39 -07:00
Min Chen
eb9cfffd24
Fix NPE due to race condition during system vm launch.
2013-11-04 14:27:04 -08:00
Min Chen
9a62239a92
CLOUDSTACK-5017: Throw CloudRuntimeException in case of template/volume
...
download when ssvm is not ready so that caller can remove some leftover
entries in template_store_ref and volume_store_ref.
2013-11-04 12:32:05 -08:00
Hugo Trippaers
54a3d8048b
Get rid of a few errors and warnings in the engine storage integration-test sources
2013-11-04 20:01:13 +01:00
Min Chen
24af28290e
CLOUDSTACK-5017: use LocalHostEndPoint in copying from S3 to cache store
...
during ssvm launch.
2013-11-01 18:07:00 -07:00
Min Chen
6eecb0b3b5
CLOUDSTACK-5017: If SSVM is unavailable DownloadCommands will be routed
...
to mgmt server.
2013-11-01 18:07:00 -07:00
Edison Su
918bc74050
fix compile
2013-11-01 16:16:03 -07:00
Edison Su
143fbc37a6
fix build
2013-11-01 16:02:24 -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
Alena Prokharchyk
591dcd1d1c
ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user
2013-10-29 09:18:11 -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
Alena Prokharchyk
2cac1aaa0f
Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud)
2013-10-28 15:03:57 -07:00
Alena Prokharchyk
5caeab782d
ResourceDetails -
...
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
2013-10-28 14:45:52 -07:00
Alena Prokharchyk
e86b612750
ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2013-10-28 12:53:53 -07:00
Alena Prokharchyk
d0090a0c24
Resource details (metadata) - added support for Storage pool details
2013-10-28 12:53:53 -07:00
Edison Su
92f97248a8
fix inject hypervisorHelperImpl
2013-10-28 12:09:14 -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
Alena Prokharchyk
24725f8e21
ResourceDetails:
...
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
Darren Shepherd
f3e968b983
Update StorageStrategyFactory to not sort, but just iterate and find the first
2013-10-23 16:36:31 -07:00
Darren Shepherd
891b85d516
Add missing licenses
2013-10-23 15:20:08 -07:00
Darren Shepherd
b134692697
Fix compilation errors in engine/storage/integration-test
2013-10-23 14:44:16 -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
Darren Shepherd
205a77a5bb
Merge remote-tracking branch 'origin/txn-refactor'
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -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
Koushik Das
0c1800f70f
CLOUDSTACK-4681: data disk with local disk offering are geting created on shared storage
...
The cluster and zone wide storage pool allocators returned shared pools even for volumes meant to be on local storage pool.
If the VM uses local disk then cluster and zone storage allocators should not handle it and return null or empty list.
Also fixed the deployment planner to avoid a cluster if
a. avoid set returned by storage pool allocators is empty OR
b. all local or shared pools in a cluster are in avoid state
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
2013-10-18 17:10:17 +05:30
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
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -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
Darren Shepherd
7c72aa96da
ConcurrentHashMap will through NPE on null key
2013-10-04 16:56:48 -07:00
Edison Su
a129fe4e66
add missing files
2013-10-04 14:17:49 -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
Hugo Trippaers
3f583684c6
Temporary fix for the chicken and egg problem when making changes to the configuration database.
2013-10-03 12:36:34 +02: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
Darren Shepherd
aed5e9dc2a
Add Manage Context framework
...
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system. As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context. This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Alex Huang
b60eef3e82
Added comments and finished off the work
2013-09-28 07:53:28 -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
a964cf549e
Continue to merge SearchCriteria2 and GenericSearchBuilder
2013-09-28 07:53:24 -07:00
Alex Huang
af8832f6bd
Unified both the SearchBuilder and SearchCriteriaService
2013-09-28 07:53:24 -07:00
Edison Su
350e8938cf
CLOUDSTACK-4754: it's a race condition: delete template, and deploy vm from the template happened at the same time,
2013-09-27 16:10:57 -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
aa59b6f34d
CLOUDSTACK-4507: fix NPE when taking snapshot
2013-09-25 16:09:00 -07:00
Edison Su
f4dbf8786f
CLOUDSTACK-4477: in order to select hypervisor host which can access storage pool, need to check storage_pool_host_ref
...
Conflicts:
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/EndpointSelectorTest.java
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
2013-09-25 16:08:41 -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
Edison Su
7b6aebc102
add test
...
Conflicts:
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
2013-09-25 15:58:46 -07:00
Edison Su
b3ac12e171
delete snapshot_store_ref if the snapshot is in error state
2013-09-25 15:51:55 -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
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
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
16a1f150eb
CLOUDSTACK-4628:[Automation] Failed to create template from snapshot
...
with same name; after deleting the first one.
2013-09-09 16:10:33 -07:00
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
Alex Huang
a05ec6df33
Fixed up the agent separation. Added comments for config packaging.
2013-09-06 15:40:39 -07:00
Alex Huang
1f5699b29f
Fixed unit tests
2013-09-06 15:40:39 -07:00
Alex Huang
8f556e6d88
Made changes to configuration. Eliminated ConfigValue and only use ConfigKey
2013-09-06 15:40:38 -07:00
Alex Huang
b8e79c30a8
Compile complete
2013-09-06 15:40:37 -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
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
Min Chen
e92d46bfd4
CLOUDSTACK-4600:Registered Cross-zone template does not populate
...
template_zone_ref for later added zones.
2013-09-03 16:39:23 -07:00
Hugo Trippaers
b220403e35
Fix EndpointSelectorTest, LockMasterListener is in the server package
...
for now.
2013-09-02 14:32:28 +02:00
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
7e7af7d6f4
CLOUDSTACK-4477: in order to select hypervisor host which can access storage pool, need to check storage_pool_host_ref
2013-08-28 16:03:19 +02:00
Min Chen
18b301edb9
CLOUDSTACK-4516:[Upgrade][VMWare]
...
MySQLIntegrityConstraintViolationException while performing any task
using local storage after upgrade from 3.0.7 to 4.2.
2013-08-27 14:13:59 -07:00
Wido den Hollander
79c366db2b
CLOUDSTACK-1191: Re-enable deployment of SystemVMs on RBD
...
This was reverted by 0a5228922b unintentionnaly
but broke this feature for RBD.
Enable SystemVM deployment on RBD again
2013-08-27 17:05:08 +02:00
Alex Huang
abbae2aa87
Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.
2013-08-26 17:31:10 -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
Min Chen
0fdaef8e3d
CLOUDSTACK-4455:object_store - Template sync results in private
...
templates being synced to all the secondary stores.
2013-08-22 16:02:47 -07:00
Min Chen
2611ac75c1
CLOUDSTACK-4454:object_store - Not able to delete secondary storage when
...
existing snapshots are deleted.
2013-08-22 16:02:31 -07:00
Min Chen
e65a302f15
CLOUDSTACK-3950: add "regionsecondaryenabled" in listCapabilitiesCmd
...
response.
2013-08-20 15:59:46 -07:00
Min Chen
3bd2bbf59d
CLOUDSTACK-3950:Set cross-zone flag in registerTemplate/registerIso in
...
case of region-wide secondary is enabled.
2013-08-20 14:13:49 -07:00
Min Chen
c4f41f4a53
CLOUDSTACK-4395:[Object_store_refactor] Default template is not
...
available for use to deploy vm in case of multi zone environment.
2013-08-19 17:37:33 -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
Edison Su
77e7ccbbe1
CLOUDSTACK-4325: add more test cases for zone wide storage pool allocator
2013-08-19 15:25:04 -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
Min Chen
5d3bc5339e
CLOUDSTACK-4399:[Templates] template entries are deleted from
...
template_store_ref when downloadTemplate times out.
2013-08-19 11:27:16 -07:00
Min Chen
ba4a05eed1
CLOUDSTACK-4287: Template sync should remove template_store_ref entry
...
for corrupted template.
2013-08-15 14:56:49 -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
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