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

pass over volume info through job boundary for all volume related tasks, since volume record may be re-created.

Browse Source
This commit is contained in:
Kelven Yang 2014-02-26 15:44:14 -08:00
parent cdf605b2cd
commit 0c48f70762
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/src/com/cloud/storage/VolumeApiServiceImpl.java
View File

@ -825,7 +825,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
Volume vol = null; Volume vol = null;
try { try {
vol = outcome.get(); outcome.get();
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException("Operation is interrupted", e); throw new RuntimeException("Operation is interrupted", e);
} catch (java.util.concurrent.ExecutionException e) { } catch (java.util.concurrent.ExecutionException e) {
@ -838,6 +838,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
throw (ConcurrentOperationException)jobResult; throw (ConcurrentOperationException)jobResult;
else if (jobResult instanceof Throwable) else if (jobResult instanceof Throwable)
throw new RuntimeException("Unexpected exception", (Throwable)jobResult); throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
else if (jobResult instanceof Long) {
vol = _volumeDao.findById((Long)jobResult);
}
} }
return volume; return volume;
} }
@ -1025,7 +1028,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
Volume vol = null; Volume vol = null;
try { try {
vol = outcome.get(); outcome.get();
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException("Operation is interrupted", e); throw new RuntimeException("Operation is interrupted", e);
} catch (java.util.concurrent.ExecutionException e) { } catch (java.util.concurrent.ExecutionException e) {
@ -1038,6 +1041,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
throw (ConcurrentOperationException)jobResult; throw (ConcurrentOperationException)jobResult;
else if (jobResult instanceof Throwable) else if (jobResult instanceof Throwable)
throw new RuntimeException("Unexpected exception", (Throwable)jobResult); throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
else if (jobResult instanceof Long) {
vol = _volumeDao.findById((Long)jobResult);
}
} }
return vol; return vol;
} }
@ -1340,7 +1346,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
Volume vol = null; Volume vol = null;
try { try {
vol = outcome.get(); outcome.get();
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw new RuntimeException("Operation is interrupted", e); throw new RuntimeException("Operation is interrupted", e);
} catch (java.util.concurrent.ExecutionException e) { } catch (java.util.concurrent.ExecutionException e) {
@ -1353,6 +1359,9 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
throw (ConcurrentOperationException)jobResult; throw (ConcurrentOperationException)jobResult;
else if (jobResult instanceof Throwable) else if (jobResult instanceof Throwable)
throw new RuntimeException("Unexpected exception", (Throwable)jobResult); throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
else if (jobResult instanceof Long) {
vol = _volumeDao.findById((Long)jobResult);
}
} }
return vol; return vol;
} }
@ -2365,19 +2374,23 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
} }
private Pair<JobInfo.Status, String> orchestrateAttachVolumeToVM(VmWorkAttachVolume work) throws Exception { private Pair<JobInfo.Status, String> orchestrateAttachVolumeToVM(VmWorkAttachVolume work) throws Exception {
orchestrateAttachVolumeToVM(work.getVmId(), work.getVolumeId(), work.getDeviceId()); Volume vol = orchestrateAttachVolumeToVM(work.getVmId(), work.getVolumeId(), work.getDeviceId());
return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null);
return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED,
_jobMgr.marshallResultObject(new Long(vol.getId())));
} }
private Pair<JobInfo.Status, String> orchestrateDetachVolumeFromVM(VmWorkDetachVolume work) throws Exception { private Pair<JobInfo.Status, String> orchestrateDetachVolumeFromVM(VmWorkDetachVolume work) throws Exception {
orchestrateDetachVolumeFromVM(work.getVmId(), work.getVolumeId()); Volume vol = orchestrateDetachVolumeFromVM(work.getVmId(), work.getVolumeId());
return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED,
_jobMgr.marshallResultObject(new Long(vol.getId())));
} }
private Pair<JobInfo.Status, String> orchestrateResizeVolume(VmWorkResizeVolume work) throws Exception { private Pair<JobInfo.Status, String> orchestrateResizeVolume(VmWorkResizeVolume work) throws Exception {
orchestrateResizeVolume(work.getVolumeId(), work.getCurrentSize(), work.getNewSize(), Volume vol = orchestrateResizeVolume(work.getVolumeId(), work.getCurrentSize(), work.getNewSize(),
work.getNewServiceOfferingId(), work.isShrinkOk()); work.getNewServiceOfferingId(), work.isShrinkOk());
return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null); return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED,
_jobMgr.marshallResultObject(new Long(vol.getId())));
} }
private Pair<JobInfo.Status, String> orchestrateMigrateVolume(VmWorkMigrateVolume work) throws Exception { private Pair<JobInfo.Status, String> orchestrateMigrateVolume(VmWorkMigrateVolume work) throws Exception {