apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Async commands need to have a start event id for event tracking.

Browse Source
This commit is contained in:
Kris McQueen 2010-09-17 12:07:16 -07:00
parent d7b6ccd056
commit 1f4b2cfb06
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/api/BaseAsyncCmd.java
View File

@ -13,6 +13,7 @@ import com.cloud.serializer.SerializerHelper;
public abstract class BaseAsyncCmd extends BaseCmd {
private AsyncJobManager _asyncJobMgr = null;
private AsyncJobVO _job = null;
private Long startEventId;
public String getResponse(long jobId) {
return SerializerHelper.toSerializedString(Long.valueOf(jobId));
@ -29,4 +30,12 @@ public abstract class BaseAsyncCmd extends BaseCmd {
public void setJob(AsyncJobVO job) {
_job = job;
}
public Long getStartEventId() {
return startEventId;
}
public void setStartEventId(Long startEventId) {
this.startEventId = startEventId;
}
}

24
server/src/com/cloud/storage/StorageManagerImpl.java
View File

@ -1673,11 +1673,12 @@ public class StorageManagerImpl implements StorageManager {
@Override @DB
public VolumeVO createVolume(CreateVolumeCmd cmd) {
VolumeVO createdVolume = _volsDao.findById(cmd.getId());
VolumeVO volume = _volsDao.findById(cmd.getId());
VolumeVO createdVolume = null;
Long userId = UserContext.current().getUserId();
if (cmd.getSnapshotId() != null) {
return createVolumeFromSnapshot(createdVolume, cmd.getSnapshotId());
return createVolumeFromSnapshot(volume, cmd.getSnapshotId());
} else {
DataCenterVO dc = _dcDao.findById(cmd.getZoneId());
DiskOfferingVO diskOffering = _diskOfferingDao.findById(cmd.getDiskOfferingId());
@ -1688,8 +1689,8 @@ public class StorageManagerImpl implements StorageManager {
Set<Long> podsToAvoid = new HashSet<Long>();
Pair<HostPodVO, Long> pod = null;
while ((pod = _agentMgr.findPod(null, null, dc, createdVolume.getAccountId(), podsToAvoid)) != null) {
if ((createdVolume = createVolume(createdVolume, null, null, dc, pod.first(), null, null, diskOffering, poolsToAvoid, size)) != null) {
while ((pod = _agentMgr.findPod(null, null, dc, volume.getAccountId(), podsToAvoid)) != null) {
if ((createdVolume = createVolume(volume, null, null, dc, pod.first(), null, null, diskOffering, poolsToAvoid, size)) != null) {
break;
} else {
podsToAvoid.add(pod.first().getId());
@ -1698,10 +1699,10 @@ public class StorageManagerImpl implements StorageManager {
// Create an event
EventVO event = new EventVO();
event.setAccountId(createdVolume.getAccountId());
event.setAccountId(volume.getAccountId());
event.setUserId(userId);
event.setType(EventTypes.EVENT_VOLUME_CREATE);
event.setStartId(startEventId); // FIX other event stuff as well for createVolume
event.setStartId(cmd.getStartEventId());
Transaction txn = Transaction.currentTxn();
@ -1718,17 +1719,18 @@ public class StorageManagerImpl implements StorageManager {
event.setLevel(EventVO.LEVEL_INFO);
event.setDescription("Created volume: " + createdVolume.getName() + " with size: " + sizeMB + " MB in pool: " + pool.getName());
event.setParameters(eventParams);
event.setState(EventState.Completed);
_eventDao.persist(event);
} else {
// Mark the existing volume record as corrupted
createdVolume.setStatus(AsyncInstanceCreateStatus.Corrupted);
createdVolume.setDestroyed(true);
_volsDao.update(createdVolume.getId(), createdVolume);
event.setDescription("Unable to create a volume for " + volume);
event.setLevel(EventVO.LEVEL_ERROR);
event.setState(EventState.Completed);
_eventDao.persist(event);
}
txn.commit();
} catch (Exception e) {
s_logger.error("Unhandled exception while creating volume " + createdVolume.getName(), e);
s_logger.error("Unhandled exception while creating volume " + volume.getName(), e);
}
}