cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From DaanHoogland <...@git.apache.org>
Subject [GitHub] cloudstack pull request: Taking fast and efficient volume snapshot...
Date Wed, 11 May 2016 15:42:21 GMT
Github user DaanHoogland commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1403#discussion_r62872442
  
    --- Diff: engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
---
    @@ -172,78 +232,211 @@ private void validate(SnapshotInfo snapshotInfo) {
             }
         }
     
    -    private Void handleCreateTemplateFromSnapshot(SnapshotInfo snapshotInfo, TemplateInfo
templateInfo, AsyncCompletionCallback<CopyCommandResult> callback) {
    +    private boolean usingBackendSnapshotFor(SnapshotInfo snapshotInfo) {
    +        String property = getProperty(snapshotInfo.getId(), "takeSnapshot");
    +
    +        return Boolean.parseBoolean(property);
    +    }
    +
    +    private void handleCreateTemplateFromSnapshot(SnapshotInfo snapshotInfo, TemplateInfo
templateInfo, AsyncCompletionCallback<CopyCommandResult> callback) {
             try {
                 snapshotInfo.processEvent(Event.CopyingRequested);
             }
             catch (Exception ex) {
                 throw new CloudRuntimeException("This snapshot is not currently in a state
where it can be used to create a template.");
             }
     
    -        HostVO hostVO = getHost(snapshotInfo.getDataStore().getId());
    -        DataStore srcDataStore = snapshotInfo.getDataStore();
    -
    -        String value = _configDao.getValue(Config.PrimaryStorageDownloadWait.toString());
    -        int primaryStorageDownloadWait = NumbersUtil.parseInt(value, Integer.parseInt(Config.PrimaryStorageDownloadWait.getDefaultValue()));
    -        CopyCommand copyCommand = new CopyCommand(snapshotInfo.getTO(), templateInfo.getTO(),
primaryStorageDownloadWait, VirtualMachineManager.ExecuteInSequence.value());
    +        HostVO hostVO = getHost(snapshotInfo);
     
    -        String errMsg = null;
    +        boolean usingBackendSnapshot = usingBackendSnapshotFor(snapshotInfo);
    +        boolean computeClusterSupportsResign = computeClusterSupportsResign(hostVO.getClusterId());
     
    -        CopyCmdAnswer copyCmdAnswer = null;
    +        if (usingBackendSnapshot && !computeClusterSupportsResign) {
    +            throw new CloudRuntimeException("Unable to locate an applicable host with
which to perform a resignature operation");
    +        }
     
             try {
    -            _volumeService.grantAccess(snapshotInfo, hostVO, srcDataStore);
    +            if (usingBackendSnapshot) {
    +                createVolumeFromSnapshot(hostVO, snapshotInfo, true);
    +            }
     
    -            Map<String, String> srcDetails = getSnapshotDetails(_storagePoolDao.findById(srcDataStore.getId()),
snapshotInfo);
    +            DataStore srcDataStore = snapshotInfo.getDataStore();
     
    -            copyCommand.setOptions(srcDetails);
    +            String value = _configDao.getValue(Config.PrimaryStorageDownloadWait.toString());
    +            int primaryStorageDownloadWait = NumbersUtil.parseInt(value, Integer.parseInt(Config.PrimaryStorageDownloadWait.getDefaultValue()));
    +            CopyCommand copyCommand = new CopyCommand(snapshotInfo.getTO(), templateInfo.getTO(),
primaryStorageDownloadWait, VirtualMachineManager.ExecuteInSequence.value());
    +
    +            String errMsg = null;
    +
    +            CopyCmdAnswer copyCmdAnswer = null;
     
    -            copyCmdAnswer = (CopyCmdAnswer)_agentMgr.send(hostVO.getId(), copyCommand);
    -        }
    -        catch (Exception ex) {
    -            throw new CloudRuntimeException(ex.getMessage());
    -        }
    -        finally {
                 try {
    --- End diff --
    
    I can not see what Rafael means. I think the code has changed since he made the comment.
I do see this method as growing out of proportion so some refactorring for readability and
maintainability seems in order.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message