Commit Graph

262 Commits

Author SHA1 Message Date
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 e444867e61 fix compile 2013-05-10 09:47:09 -07:00
Edison Su 42e25a22fc refactor kvm/vmware resource code 2013-05-09 23:10:05 -07:00
Min Chen 2c22488ed7 Filter out cache store in find image store by provider. 2013-05-09 21:49:12 -07:00
Min Chen 6f4fcf741c Fix listImageStores to only list store with Image role, excluding those
cache stores since they are also stored in image_store table.
2013-05-09 21:49:12 -07:00
Min Chen f965e2d892 Download system template while adding S3 image store is working. 2013-05-09 21:49:12 -07:00
Sanjay Tripathi 3aed20c9d2 CLOUDSTACK-1603: Management server .log Java Exceptions are displayed with Alerts 2013-05-10 10:18:37 +05:30
Min Chen 292e77b96b Fix marvin test to add S3 image store and cache storage. 2013-05-09 16:19:06 -07:00
Min Chen fa11575212 Add store_role to template_store_ref, and add search function to find
template_store_ref entry based on DataStoreRole and ZoneId.
2013-05-08 22:06:07 -07:00
Min Chen dc5d2f45e9 Make copyFromS3ToNFS flow work. 2013-05-08 17:39:46 -07:00
Min Chen 3b45bc9c30 Make S3 register template work. 2013-05-08 11:12:26 -07:00
Min Chen f8edb55497 Register template, delete template and create instance from registered
template are working on NFS.
2013-05-08 10:29:09 -07:00
Edison Su ac7be218d5 creat template from volume/snapshot, and then create vm from template works now 2013-05-07 20:18:19 -07:00
Edison Su 5aeca646ae make create template from volume/snapshot work 2013-05-07 20:18:19 -07:00
Min Chen d79b890904 Change VMTemplate state in destroy. 2013-05-07 17:45:06 -07:00
Min Chen 8984e430ce Add state transition for destroy scenario. 2013-05-07 17:45:06 -07:00
Min Chen 3315b23595 Relax url port validation and some MockLocalNfsSecondaryStorageResource
fix.
2013-05-07 13:34:27 -07:00
Min Chen 41272c976e Add DeleteTemplate unit test. 2013-05-06 23:02:28 -07:00
Min Chen 26424ff2a8 Make url in AddImageStoreCmd not required since S3 does not have url. 2013-05-06 22:14:49 -07:00
Min Chen e7f6333209 Merge branch 'object_store' of https://git-wip-us.apache.org/repos/asf/cloudstack into object_store 2013-05-06 21:21:40 -07:00
Edison Su 0e28772957 fix race condition, when multiple vms on the same templates are started at the same time 2013-05-06 19:04:41 -07:00
Edison Su 1b8e7aba73 uncomment out template sync 2013-05-06 18:28:47 -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 f5d5526d41 Fix unit test to test NFS template download flow. 2013-05-06 18:02:52 -07:00
Alex Huang 3722d66aae Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
Min Chen 0d78209b73 Address various UI requirements by introducing provider constants. 2013-05-06 15:12:33 -07:00
Min Chen 7ad263b67e Revert previous workaround for ListTemplateCommand, which is correct
after updating the systemvm.iso on devcloud.
2013-05-06 11:29:57 -07:00
Min Chen a221ecb484 Workaround an issue of null url when ListTemplateCommand is received on
SSVM side, also fix a bug in listTemplates with id passed.
2013-05-04 23:09:23 -07:00
Edison Su 23d6f12e9a fix db select 2013-05-03 15:44:38 -07:00
Edison Su acafccfbc6 fix volume state change 2013-05-03 15:01:09 -07:00
Min Chen 23db72d8b4 S3 template download test is working except state transition part. 2013-05-03 14:59:13 -07:00
Min Chen df7a56d63f Removed redundant getInstallPath to use getPath in VolumeInfo. 2013-05-03 10:01:23 -07:00
Edison Su fc74d76696 add volume test case 2013-05-03 09:53:06 -07:00
Edison Su 0c6e87c701 download template to primary storage works now 2013-05-03 09:45:31 -07:00
Min Chen c60c373a38 Modify DownloadCommand to pass DataTO. 2013-05-02 23:05:19 -07:00
Min Chen 87fafb7287 Add S3 register template integration test. 2013-05-02 15:20:46 -07:00
Edison Su 2384276536 make template download testable 2013-05-02 00:38:11 -07:00
Edison Su 164bedd5ae revive java integration test 2013-05-01 18:24:47 -07:00
Edison Su 4d992fd18f fix template download to primary storage 2013-05-01 17:51:24 -07:00
Min Chen 2812873ffa Remove methods of searching for secondary storages from host table from
SecondaryStorageManagerImpl.
2013-05-01 17:35:51 -07:00
Min Chen 8a5bd9e8f8 Fix a sql bug in selecting end point to send message. 2013-05-01 16:04:40 -07:00
Edison Su 52799f46a4 fix data motion 2013-05-01 14:00:53 -07:00
Min Chen 3c6b7c2a01 Populate system vm template to template_store_ref in adding an image
store.
2013-05-01 12:10:24 -07:00
Min Chen 36c1538f06 Bugfix to make deployDataCenter.py work. 2013-04-30 17:42:48 -07:00
Min Chen bbd5d13213 Fix bugs in refactored listTemplates and listIsos API. 2013-04-30 11:31:45 -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 91bfbdf1c4 Handle ListTemplateCommand in NfsSecondaryStorageResource for various
data store provider.
2013-04-26 12:25:06 -07:00
Nitin Mehta d1642a489c =initial changes 2013-04-25 18:29:57 +05:30
Edison Su 4029e7af44 refactor data motion service for volumes 2013-04-24 18:53:57 -07:00
Min Chen 4c174a6867 Fix DeleteSnapshotBackupCommand to pass dataStore information. 2013-04-24 17:30:38 -07:00
Min Chen 5b76e4914c Remove sendToSecStorage methods from agentManager to use EndPoint
instead.
2013-04-24 16:21:41 -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 792fc471a2 Remove VolumeHostDao references from codebase. 2013-04-24 11:11:58 -07:00
Min Chen 0cfef3aa4e Remove almost all VMTemplateHostDao references except S3Manager and
SwiftManager.
2013-04-23 17:51:54 -07:00
Min Chen 06b3092083 Remove VMTemplateHostDao reference from VolumeManagerImpl,
StorageManagerImpl and SecondaryStorageManagerImpl.
2013-04-23 12:10:40 -07:00
Min Chen e40a06deae Fix extractTemplateCmd. 2013-04-22 21:48:57 -07:00
Edison Su b8c5c67fbc add copycommand at resouce side 2013-04-22 19:12:50 -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 5f90aa971a Implement createTemplateCmd and consolidate several copy calls in
TemplateServiceImpl.
2013-04-22 15:33:43 -07:00
Edison Su b30e39b0e3 CLOUDSTACK-1392: add create template from snapshot and volume 2013-04-22 13:24:10 -07:00
Min Chen 9c584b5500 Use EndPoint to send local/remote command, and hide agentMgr message
passing.
2013-04-22 13:21:28 -07:00
Min Chen ffdf567b58 Add implemention to pick EndPoint for secondary storage 2013-04-22 13:19:04 -07:00
Edison Su abf40435f3 refactor downloadlistener, sync system vm templates when adding a new image store 2013-04-21 22:46:02 -07:00
Min Chen 0229c75b50 Use data motion service for PrepareTemplateCmd to move template from
secondary storage to primary.
2013-04-20 20:44:31 -07:00
Min Chen 86913ab4d3 Use data motion service to implement copy template. 2013-04-19 23:01:59 -07:00
Min Chen 6f70fe28e8 Trigger system vm template download while adding image store. Just a
code skeleton, waiting for some code in EndPoint.
2013-04-19 19:37:06 -07:00
Min Chen b8229349f5 Rename HypervisorHostEndPoint to RemoteHostEndPoint to accommodate ssvm
as well.
2013-04-19 17:46:33 -07:00
Devdeep Singh b01f63123f CS-1879: NPE while migrating volume. The state transitions on the volume that has to be migrated were incorrect. A volume to be migrated is in ready state and cannot be transitioned to copying state. Similarly, the duplicated volume is in ready state too and cannot be transitioned to creating state. Fixed it by transitioning the volume to migrating state when a migrateVolume api call is made. Also, a volume has to be destroyed first before it can be expunged. Fixed that too.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-19 16:15:24 +05:30
Devdeep Singh 21ce3befc8 Storage motion for Xenserver changes: 1. Implemented Api findStoragePoolsForMigration. Added a new response objects to list storage pools available for migration. 2. Updated migrateVolume api for allowing migrating volumes of running vms. These changes are integrated into the latest storage refactoring changes. 3. Added the implementation for findHostsForMigration api. It lists the hosts to which an instance can be migrated, including hosts from within and across clusters to which an instance may be migrated with storage motion. The work of migrating a volume of a running vm is also done in copyAsync. 4. Updated the listHosts api for backward compatibility. 5. Added the implementation for migrateVirtualMachineWithVolume api. It migrates an instance with its volumes within a cluster and also across clusters. Also introduced a new XenServerStorageMotionStrategy for migrating volumes of a vm. When a vm is being migrated with its volumes, the vm is put in migrating state and a request is send to the volume manager to migrate the vm and its volumes. Volume manager calls into the volume service which forwards the request to data motion service after moving all the volumes to migrating state. Data motion service enumerates the strategies and the request reaches the XenServerStorageMotionStrategy. It calls in to the resource to complete the operation. 6. Resolved an issue where storage xenmotion of 2nd VM created from the same template to a host was failing with duplicate_vm exception. Made changes to remove the mac_seed key value pair from other_config when vms are created. This is was storage motion to fail. 7. Updated the db upgrade schema script. 8. Added the right permissions in commands.properties 9. Marvin tests for testing storage motion. Following scenarios are tested. 9.1. A virtual machine is migrated to another host. Its volumes are also migrated to another storage pool. 9.2. Just the volumes of a vm are migrated to another storage pool while the vm continues to run on the same host. 10. Unit tests for testing migration of a vm with its volumes.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-19 11:36:42 +05:30
Edison Su ef30ee52ee add copy stuff from s3 into nfs cache storage 2013-04-18 13:44:49 -07:00
Edison Su 1fe5d7c886 need to download image to cache storage from s3/swift on mgt server for default system vm templates 2013-04-18 01:56:34 -07:00
Min Chen fe4f53bfcd Fix SecStorageSetupCommand for Nfs image store. 2013-04-17 17:16:01 -07:00
Min Chen 14b5f0da19 Rename ImageDataFactoryxxx to TemplateDataFactory to have consistent
naming conventions for Template data factory class.
2013-04-17 11:45:25 -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
Min Chen 1b3994e180 Fix copyTemplateCmd. 2013-04-16 16:38:14 -07:00
Min Chen 0da2da852b Fix the flow of deleteTemplateCmd. 2013-04-16 12:03:12 -07:00
Mice Xia ce3337cdd6 CLOUDSTACK-1983 StackOverflowError while deleting snapshot 2013-04-16 13:18:44 +08:00
Mice Xia cbe021b8d2 CLOUDSTACK-2040 VM with snapshot not getting destroyed during account delation 2013-04-16 13:18:44 +08:00
Min Chen 593337565e Add S3 code to handle DownloadCommand for registerTemplate. 2013-04-15 14:44:39 -07:00
Pascal Borreli 20614598bf Fixed typos
Signed-off-by: Milamber <milamber@apache.org>
2013-04-13 13:28:32 +00:00
Min Chen 2dd8e2cb97 add getStoreTO into each DataStoreDriver, and add implementation for 3
data store plugins.
2013-04-12 18:22:23 -07:00
Min Chen 2ff01a79ca Rename TemplateTO/VolumeTO in cloud-engine-storage to
TemplateObjectTO/VolumeObjectTO to avoid name conflicting with the one
in cloud-api.
2013-04-12 17:10:19 -07:00
Edison Su b81fa6d9ea add copy template to cache store 2013-04-12 16:03:30 -07:00
Pascal Borreli 95cbb790f3 Fixed Primary typo 2013-04-12 16:20:11 +01:00
Chip Childers 3b35063adf Revert "Fixed Primary typo"
This reverts commit 4e5a8a0f8a.
2013-04-12 15:18:02 +01:00
Pascal Borreli 4e5a8a0f8a Fixed Primary typo
Conflicts:

	client/WEB-INF/classes/resources/messages_de_DE.properties
2013-04-12 14:14:44 +01:00
Min Chen bb64672715 Refactor DownloadMonitorImpl code, move some functionalities to
TemplateServiceImpl and VolumeServiceImpl.
2013-04-11 18:09:42 -07:00
Min Chen 582a1f0539 Fix ImageStoreDaoImpl to return only image stores, not image cache
stores.
2013-04-11 11:54:30 -07:00
Edison Su 1c448cd6e3 add cache storage 2013-04-11 11:01:29 -07:00
Edison Su e5bf38ed05 add cache storage 2013-04-11 10:52:53 -07:00
Min Chen 02686583cf First draft of register template using image store. 2013-04-10 18:02:53 -07:00
Min Chen 3897590bb1 Add check in addImageStoreCmd to guarantee our assumption of homogeneous
image stores.
2013-04-09 16:36:02 -07:00
Min Chen b2d5535bba Remove State from image_store db table, and removed enableImageStore
api.
2013-04-09 15:38:33 -07:00
Min Chen 2a177de2bc Remove unused DataStoreProviderDao since provider does not has its own
db table.
2013-04-09 14:59:07 -07:00
Min Chen 9be9902ed5 Fix applicationContext.xml to properly load all new refactored image
store related classes, also add enableImageStore api.
2013-04-09 14:49:09 -07:00
Min Chen 74880fa26f add DeleteImageStoreCmd Api. 2013-04-08 16:18:06 -07:00