Repository: cloudstack Updated Branches: refs/heads/4.5 [created] 50ee9810a
CLOUDSTACK-6969. Data Volume Shrink operation failing with "Unexpected Exception". (cherry picked from commit bca71ec16953791bf0980fca4c55817ded8885b2) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54110edd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54110edd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54110edd Branch: refs/heads/4.5 Commit: 54110edda13ac192b8850439dcdd89aea1e278d4 Parents: 759b5fa Author: Likitha Shetty <[email protected]> Authored: Wed Oct 1 14:30:52 2014 +0530 Committer: David Nalley <[email protected]> Committed: Mon Oct 13 00:14:09 2014 -0400 ---------------------------------------------------------------------- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54110edd/server/src/com/cloud/storage/VolumeApiServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index d89ea4f..e089b77 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -1046,12 +1046,17 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } else { _resourceLimitMgr.decrementResourceCount(volume.getAccountId(), ResourceType.primary_storage, volume.isDisplayVolume(), new Long(currentSize - newSize)); } + return volume; } catch (InterruptedException e) { s_logger.warn("failed get resize volume result", e); + throw new CloudRuntimeException(e.getMessage()); } catch (ExecutionException e) { s_logger.warn("failed get resize volume result", e); + throw new CloudRuntimeException(e.getMessage()); + } catch (Exception e) { + s_logger.warn("failed get resize volume result", e); + throw new CloudRuntimeException(e.getMessage()); } - return volume; } @Override
