6c23e201ad
1) More fixes for the problems found by findBugs
...
2) Corrected some logging in MidoNetPublicNetworkGuru - removed .toString method call on the objects in the log body as toString is called on the object by default when use log4j
2014-03-13 16:05:45 -07:00
99bdc8d875
Merge branch 'master' into rbac.
2014-03-13 11:05:03 -07:00
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
48e08fe676
Merge branch 'master' into rbac.
2014-03-06 14:02:20 -08:00
b06e66c50a
CLOUDSTACK-6170
2014-03-05 13:55:12 -07:00
d0ae4d9a9f
CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM
...
entity type.
2014-03-05 09:40:55 -08:00
339c4f4c3f
CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.
...
For root admin - s/he should be able to see all the events despite the value of the flag.
2014-03-04 14:59:30 -08:00
624139d8ef
CLOUDSTACK-6172: Volume is not retaining same uuid when migrating from one storage to another.
2014-02-26 14:42:34 +05:30
f41604fc6c
Renaming AclEntityType --> IAMEntityType
2014-02-25 16:43:17 -08:00
ac00ab0087
Cleanup all mysql dependencies and set all to provided.
2014-02-21 14:55:11 +01:00
e0de79b170
Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command
2014-02-10 12:05:59 -08:00
306ffa0218
CLOUDSTACK-6053: While adding a primary or secondary of type smb the password wasn't
...
encoded. This cause createStoragePool or addImageStore command to fail if special
characters were present. Updated the code to pass user, password and domain as part
of details while adding primary or secondary. Also made changes on server side to
handle it.
2014-02-10 10:29:09 +05:30
3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
bac2c1e5b4
CLOUDSTACK-6049: Give priority to cache stores where data object is
...
already there instead of randomly picking one in case there are multiple
cache stores in the scope.
2014-02-06 17:19:24 -08:00
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
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
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
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
7f34282dfa
Removed references to secondarystoragevmmanager from code that doesn't use it.
2014-02-05 01:39:15 +00:00
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
9b21da65d1
CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after
...
migarting to S3 datastore.
2014-02-04 11:01:51 -08:00
ca1b340cef
findbugs make use of return of string manipulation
2014-02-04 11:21:01 +01:00
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
d56c5dfc13
Fix for a potential NPE
2014-01-31 09:37:11 +01:00
16a9171f55
Fix trailing whitespace.
2014-01-28 14:53:18 -08:00
a26c81178b
CLOUDSTACK-5971:Templates created from a snapshots can't be copied to
...
other zones.
2014-01-28 14:49:58 -08:00
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
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
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
21a44934b4
Removed a duplicate method
2014-01-10 13:36:04 -07:00
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
ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07:00
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
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
3223028fd6
CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be
...
used cross-zone.
2014-01-08 17:43:06 -08:00
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
3ad0e8fb47
CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table.
2014-01-06 11:36:43 +05:30
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
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
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
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
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
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
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00
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
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
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
bb91b739a8
CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.
2013-12-18 15:44:00 -08:00
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
7c6f1c14c2
ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and
2013-12-12 16:31:00 -08:00
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
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
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
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
81c07f1791
allow delete snapshot with ERROR state
2013-11-28 10:48:07 +01:00
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
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -08:00
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
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
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
465626f6d1
Fixed issues with execute in sequence
2013-11-19 17:20:58 -08:00
bb8f8fb20b
Expose getPrimaryDataStore(String uuid) through the DatastoreManager interface so it can be used clients.
2013-11-18 14:27:06 +01:00
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
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
4815b024bf
Add quiesce vm for vmware during vm snapshot
2013-11-08 15:47:11 -08:00
c233492bfc
Add quiencevm option on createsnapshotcmd
2013-11-07 14:57:05 -08:00
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
f6f4a93145
Fix CID 1116743 Resource leak
2013-11-07 16:23:20 +01:00
10c513a259
CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2013-11-06 21:02:39 -07:00
eb9cfffd24
Fix NPE due to race condition during system vm launch.
2013-11-04 14:27:04 -08:00
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
54a3d8048b
Get rid of a few errors and warnings in the engine storage integration-test sources
2013-11-04 20:01:13 +01:00
24af28290e
CLOUDSTACK-5017: use LocalHostEndPoint in copying from S3 to cache store
...
during ssvm launch.
2013-11-01 18:07:00 -07:00
6eecb0b3b5
CLOUDSTACK-5017: If SSVM is unavailable DownloadCommands will be routed
...
to mgmt server.
2013-11-01 18:07:00 -07:00
918bc74050
fix compile
2013-11-01 16:16:03 -07:00
143fbc37a6
fix build
2013-11-01 16:02:24 -07:00
7c99b88926
Don't use cast to PrimarydataStoreTO on the resource code
2013-11-01 15:13:16 -07:00
b704d5b8d3
add quiesceVm vm helper function
2013-10-31 16:24:48 -07:00
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
6be228a438
CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
...
storage to S3.
2013-10-28 21:01:31 -07:00
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
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
e86b612750
ResourceDetails - added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2013-10-28 12:53:53 -07:00
d0090a0c24
Resource details (metadata) - added support for Storage pool details
2013-10-28 12:53:53 -07:00
92f97248a8
fix inject hypervisorHelperImpl
2013-10-28 12:09:14 -07:00
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
70b2c0150d
rebase to spring changes
2013-10-25 18:15:36 -07:00
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
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
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
f3e968b983
Update StorageStrategyFactory to not sort, but just iterate and find the first
2013-10-23 16:36:31 -07:00
891b85d516
Add missing licenses
2013-10-23 15:20:08 -07:00
b134692697
Fix compilation errors in engine/storage/integration-test
2013-10-23 14:44:16 -07:00
c9101966e0
Added StorageStrategyFactory to centralize and deduplicate some logic
2013-10-23 12:40:41 -07:00
81d01369d7
Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
...
Conflicts:
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -07:00
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
2013-10-23 12:21:43 -07:00
Alena Prokharchyk
Min Chen
John Kinsella
Mike Tutkowski
Nitin Mehta
Sanjay Tripathi
Prachi Damle
Hugo Trippaers
Devdeep Singh
Ian Southam
Alex Huang
Daan Hoogland
Marcus Sorensen
Sateesh Chodapuneedi
Likitha Shetty
Edison Su
Wei Zhou
Wido den Hollander
Harikrishna Patnala
Chris Suich
Laszlo Hornyak
Darren Shepherd