apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CE-113 trace logging and rethrow instead of nesting CloudRuntimeException

Browse Source
This commit is contained in:
Daan Hoogland 2017-03-30 16:35:37 +02:00
parent d96b3cd19c
commit c689d4a696
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
View File

@ -282,6 +282,9 @@ public class SnapshotServiceImpl implements SnapshotService {
try { try {
SnapshotResult res = future.get(); SnapshotResult res = future.get();
if (res.isFailed()) { if (res.isFailed()) {
// TODO add cleanup actions in this case
// TODO think of whether a runtime exception is really what we want]
throw new CloudRuntimeException(res.getResult()); throw new CloudRuntimeException(res.getResult());
} }
SnapshotInfo destSnapshot = res.getSnapshot(); SnapshotInfo destSnapshot = res.getSnapshot();

8
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
View File

@ -1993,8 +1993,14 @@ public class VolumeServiceImpl implements VolumeService {
SnapshotInfo snapshot = null; SnapshotInfo snapshot = null;
try { try {
snapshot = snapshotMgr.takeSnapshot(volume); snapshot = snapshotMgr.takeSnapshot(volume);
} catch (CloudRuntimeException cre) {
s_logger.error("Take snapshot: " + volume.getId() + " failed", cre);
// TODO deal with cleaning the mess
throw cre;
} catch (Exception e) { } catch (Exception e) {
s_logger.debug("Take snapshot: " + volume.getId() + " failed", e); if(s_logger.isDebugEnabled()) {
s_logger.debug("unknown exception while taking snapshot for volume " + volume.getId() + " was caught", e);
}
throw new CloudRuntimeException("Failed to take snapshot", e); throw new CloudRuntimeException("Failed to take snapshot", e);
} }

9
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View File

@ -1114,8 +1114,17 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
} catch (Exception e) { } catch (Exception e) {
s_logger.debug("post process snapshot failed", e); s_logger.debug("post process snapshot failed", e);
} }
} catch (CloudRuntimeException cre) {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Failed to create snapshot" + cre.getLocalizedMessage());
}
_resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.snapshot);
_resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.secondary_storage, new Long(volume.getSize()));
throw cre;
} catch (Exception e) { } catch (Exception e) {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Failed to create snapshot", e); s_logger.debug("Failed to create snapshot", e);
}
_resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.snapshot); _resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.snapshot);
_resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.secondary_storage, new Long(volume.getSize())); _resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.secondary_storage, new Long(volume.getSize()));
throw new CloudRuntimeException("Failed to create snapshot", e); throw new CloudRuntimeException("Failed to create snapshot", e);