volume upload: persisting into volume store ref only when SSVM is found
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a7107438 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a7107438 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a7107438 Branch: refs/heads/volume-upload Commit: a710743871d0d950ea06d829517131b19d0f46f3 Parents: b343fb7 Author: Rajani Karuturi <[email protected]> Authored: Wed Jan 21 17:43:41 2015 +0530 Committer: Rajani Karuturi <[email protected]> Committed: Thu Jan 29 16:55:24 2015 +0530 ---------------------------------------------------------------------- .../org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a7107438/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index 532c982..b0795ae 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -1226,9 +1226,6 @@ public class VolumeServiceImpl implements VolumeService { @Override public Pair<EndPoint,DataObject> registerVolumeForPostUpload(VolumeInfo volume, DataStore store) { - DataObject volumeOnStore = store.create(volume); - - volumeOnStore.processEvent(Event.CreateOnlyRequested); EndPoint ep = _epSelector.select(store); if (ep == null) { @@ -1236,6 +1233,7 @@ public class VolumeServiceImpl implements VolumeService { s_logger.warn(errorMessage); throw new CloudRuntimeException(errorMessage); } + DataObject volumeOnStore = store.create(volume); return new Pair<>(ep,volumeOnStore); }
