etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Event typo fix (#12350)

This commit is contained in:
Suresh Kumar Anaparti 2026-01-02 14:04:59 +05:30 committed by GitHub
parent 10dcbd76f0
commit 4f74937855
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java
View File

@ -33,9 +33,9 @@ public interface ObjectInDataStoreStateMachine extends StateObject<ObjectInDataS
Destroying("Template is destroying"),
Destroyed("Template is destroyed"),
Failed("Failed to download Template");
String _description;
final String _description;
private State(String description) {
State(String description) {
_description = description;
}
@ -48,7 +48,7 @@ public interface ObjectInDataStoreStateMachine extends StateObject<ObjectInDataS
CreateRequested,
CreateOnlyRequested,
DestroyRequested,
OperationSuccessed,
OperationSucceeded,
OperationFailed,
CopyRequested,
CopyingRequested,

2
engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java vendored
View File

@ -323,7 +323,7 @@ public class StorageCacheManagerImpl implements StorageCacheManager, Manager {
if (result.isFailed()) {
objOnCacheStore.processEvent(Event.OperationFailed);
} else {
objOnCacheStore.processEvent(Event.OperationSuccessed, result.getAnswer());
objOnCacheStore.processEvent(Event.OperationSucceeded, result.getAnswer());
objOnCacheStore.incRefCount();
return objOnCacheStore;
}

4
engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
View File

@ -396,7 +396,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
return answer;
}
objOnImageStore.processEvent(Event.OperationSuccessed, answer);
objOnImageStore.processEvent(Event.OperationSucceeded, answer);
objOnImageStore.processEvent(Event.CopyingRequested);
@ -427,7 +427,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy {
throw e;
}
objOnImageStore.processEvent(Event.OperationSuccessed);
objOnImageStore.processEvent(Event.OperationSucceeded);
deleteVolumeOnSecondaryStore(objOnImageStore);
return answer;
} else {

12
engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java
View File

@ -1048,7 +1048,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
//submit processEvent
if (StringUtils.isEmpty(errMsg)) {
snapshotInfo.processEvent(Event.OperationSuccessed);
snapshotInfo.processEvent(Event.OperationSucceeded);
} else {
snapshotInfo.processEvent(Event.OperationFailed);
}
@ -1211,7 +1211,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
// command to copy this data from cache to secondary storage. We
// then clean up the cache.
destOnStore.processEvent(Event.OperationSuccessed, copyCmdAnswer);
destOnStore.processEvent(Event.OperationSucceeded, copyCmdAnswer);
CopyCommand cmd = new CopyCommand(destOnStore.getTO(), destData.getTO(), primaryStorageDownloadWait,
VirtualMachineManager.ExecuteInSequence.value());
@ -1261,7 +1261,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
try {
if (StringUtils.isEmpty(errMsg)) {
snapshotInfo.processEvent(Event.OperationSuccessed);
snapshotInfo.processEvent(Event.OperationSucceeded);
}
else {
snapshotInfo.processEvent(Event.OperationFailed);
@ -1394,7 +1394,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
try {
if (StringUtils.isEmpty(errMsg)) {
snapshotInfo.processEvent(Event.OperationSuccessed);
snapshotInfo.processEvent(Event.OperationSucceeded);
}
else {
snapshotInfo.processEvent(Event.OperationFailed);
@ -2316,7 +2316,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
_volumeDao.update(volumeVO.getId(), volumeVO);
_volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSuccessed, null, srcVolumeInfo, destVolumeInfo, false);
_volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSucceeded, null, srcVolumeInfo, destVolumeInfo, false);
// Update the volume ID for snapshots on secondary storage
@ -2639,7 +2639,7 @@ public class StorageSystemDataMotionStrategy implements DataMotionStrategy {
try {
if (StringUtils.isEmpty(errMsg)) {
volumeInfo.processEvent(Event.OperationSuccessed);
volumeInfo.processEvent(Event.OperationSucceeded);
}
else {
volumeInfo.processEvent(Event.OperationFailed);

4
engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java
View File

@ -257,9 +257,9 @@ public class SecondaryStorageServiceImpl implements SecondaryStorageService {
}
} else {
if (destData instanceof VolumeInfo) {
((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
} else {
destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
}
updateDataObject(srcData, destData);
logger.debug("Deleting source data");

14
engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
View File

@ -669,7 +669,7 @@ public class TemplateServiceImpl implements TemplateService {
TemplateApiResult res = new TemplateApiResult(tmplt);
if (result.isSuccess()) {
logger.info("Copied template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
tmplt.processEvent(Event.OperationSuccessed, result.getAnswer());
tmplt.processEvent(Event.OperationSucceeded, result.getAnswer());
publishTemplateCreation(tmplt);
} else {
logger.warn("Failed to copy template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
@ -822,7 +822,7 @@ public class TemplateServiceImpl implements TemplateService {
}
try {
template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
} catch (Exception e) {
result.setResult(e.toString());
if (parentCallback != null) {
@ -1031,7 +1031,7 @@ public class TemplateServiceImpl implements TemplateService {
CommandResult result = callback.getResult();
TemplateObject vo = context.getTemplate();
if (result.isSuccess()) {
vo.processEvent(Event.OperationSuccessed);
vo.processEvent(Event.OperationSucceeded);
} else {
vo.processEvent(Event.OperationFailed);
}
@ -1091,7 +1091,7 @@ public class TemplateServiceImpl implements TemplateService {
// no change to existing template_store_ref, will try to re-sync later if other call triggers this sync operation, like copy template
} else {
// this will update install path properly, next time it will not sync anymore.
destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
}
future.complete(res);
} catch (Exception e) {
@ -1271,7 +1271,7 @@ public class TemplateServiceImpl implements TemplateService {
res.setResult(result.getResult());
destTemplate.processEvent(Event.OperationFailed);
} else {
destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
}
future.complete(res);
} catch (Exception e) {
@ -1296,7 +1296,7 @@ public class TemplateServiceImpl implements TemplateService {
res.setResult(result.getResult());
destTemplate.processEvent(Event.OperationFailed);
} else {
destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
}
future.complete(res);
} catch (Exception e) {
@ -1382,7 +1382,7 @@ public class TemplateServiceImpl implements TemplateService {
TemplateApiResult dataDiskTemplateResult = new TemplateApiResult((TemplateObject)dataDiskTemplate);
try {
if (result.isSuccess()) {
dataDiskTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
dataDiskTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
} else {
dataDiskTemplate.processEvent(Event.OperationFailed);
dataDiskTemplateResult.setResult(result.getResult());

2
engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
View File

@ -131,7 +131,7 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
CreateObjectAnswer createSnapshotAnswer = new CreateObjectAnswer(snapTO);
snapshotOnImageStore.processEvent(Event.OperationSuccessed, createSnapshotAnswer);
snapshotOnImageStore.processEvent(Event.OperationSucceeded, createSnapshotAnswer);
SnapshotObject snapObj = castSnapshotInfoToSnapshotObject(snapshot);
try {
snapObj.processEvent(Snapshot.Event.OperationNotPerformed);

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

@ -212,7 +212,7 @@ public class SnapshotServiceImpl implements SnapshotService {
}
try {
snapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
snapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
snapshot.processEvent(Snapshot.Event.OperationSucceeded);
} catch (Exception e) {
logger.debug("Failed to create snapshot: ", e);
@ -423,7 +423,7 @@ public class SnapshotServiceImpl implements SnapshotService {
try {
CopyCmdAnswer copyCmdAnswer = (CopyCmdAnswer)result.getAnswer();
destSnapshot.processEvent(Event.OperationSuccessed, copyCmdAnswer);
destSnapshot.processEvent(Event.OperationSucceeded, copyCmdAnswer);
srcSnapshot.processEvent(Snapshot.Event.OperationSucceeded);
snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), copyCmdAnswer);
future.complete(snapResult);
@ -448,7 +448,7 @@ public class SnapshotServiceImpl implements SnapshotService {
}
try {
Answer answer = result.getAnswer();
destSnapshot.processEvent(Event.OperationSuccessed);
destSnapshot.processEvent(Event.OperationSucceeded);
snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), answer);
future.complete(snapResult);
} catch (Exception e) {
@ -491,7 +491,7 @@ public class SnapshotServiceImpl implements SnapshotService {
res = new SnapshotResult(context.snapshot, null);
res.setResult(result.getResult());
} else {
snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
res = new SnapshotResult(context.snapshot, null);
}
} catch (Exception e) {
@ -681,7 +681,7 @@ public class SnapshotServiceImpl implements SnapshotService {
// no change to existing snapshot_store_ref, will try to re-sync later if other call triggers this sync operation
} else {
// this will update install path properly, next time it will not sync anymore.
destSnapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
destSnapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
}
future.complete(res);
} catch (Exception e) {
@ -711,7 +711,7 @@ public class SnapshotServiceImpl implements SnapshotService {
try {
SnapshotObject srcSnapshot = (SnapshotObject)snapshot;
srcSnapshot.processEvent(Event.DestroyRequested);
srcSnapshot.processEvent(Event.OperationSuccessed);
srcSnapshot.processEvent(Event.OperationSucceeded);
srcSnapshot.processEvent(Snapshot.Event.OperationFailed);

8
engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
View File

@ -178,7 +178,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
}
try {
objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
} catch (NoTransitionException e) {
try {
objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationFailed);
@ -267,7 +267,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
}
try {
objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
} catch (NoTransitionException e) {
logger.debug("Failed to update copying state: ", e);
try {
@ -341,7 +341,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
} else {
try {
objectInDataStoreMgr.update(destObj, Event.OperationSuccessed);
objectInDataStoreMgr.update(destObj, Event.OperationSucceeded);
} catch (NoTransitionException e) {
logger.debug("delete failed", e);
} catch (ConcurrentOperationException e) {
@ -365,7 +365,7 @@ public class DataObjectManagerImpl implements DataObjectManager {
event = ObjectInDataStoreStateMachine.Event.CreateRequested;
objectInDataStoreMgr.update(objInStore, event);
objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
} catch (NoTransitionException e) {
logger.debug("Failed to update state", e);
throw new CloudRuntimeException("Failed to update state", e);

16
engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java
View File

@ -91,27 +91,27 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager {
stateMachines.addTransition(State.Allocated, Event.CreateOnlyRequested, State.Creating);
stateMachines.addTransition(State.Allocated, Event.DestroyRequested, State.Destroying);
stateMachines.addTransition(State.Allocated, Event.OperationFailed, State.Failed);
stateMachines.addTransition(State.Allocated, Event.OperationSuccessed, State.Ready);
stateMachines.addTransition(State.Allocated, Event.OperationSucceeded, State.Ready);
stateMachines.addTransition(State.Creating, Event.OperationFailed, State.Allocated);
stateMachines.addTransition(State.Creating, Event.OperationSuccessed, State.Ready);
stateMachines.addTransition(State.Creating, Event.OperationSucceeded, State.Ready);
stateMachines.addTransition(State.Ready, Event.CopyingRequested, State.Copying);
stateMachines.addTransition(State.Copying, Event.OperationSuccessed, State.Ready);
stateMachines.addTransition(State.Copying, Event.OperationSucceeded, State.Ready);
stateMachines.addTransition(State.Copying, Event.OperationFailed, State.Ready);
stateMachines.addTransition(State.Ready, Event.DestroyRequested, State.Destroying);
stateMachines.addTransition(State.Destroying, Event.DestroyRequested, State.Destroying);
stateMachines.addTransition(State.Destroying, Event.OperationSuccessed, State.Destroyed);
stateMachines.addTransition(State.Destroying, Event.OperationSucceeded, State.Destroyed);
stateMachines.addTransition(State.Destroying, Event.OperationFailed, State.Destroying);
stateMachines.addTransition(State.Failed, Event.DestroyRequested, State.Destroying);
// TODO: further investigate why an extra event is sent when it is
// already Ready for DownloadListener
stateMachines.addTransition(State.Ready, Event.OperationSuccessed, State.Ready);
stateMachines.addTransition(State.Ready, Event.OperationSucceeded, State.Ready);
// State transitions for data object migration
stateMachines.addTransition(State.Ready, Event.MigrateDataRequested, State.Migrating);
stateMachines.addTransition(State.Ready, Event.CopyRequested, State.Copying);
stateMachines.addTransition(State.Allocated, Event.MigrateDataRequested, State.Migrating);
stateMachines.addTransition(State.Migrating, Event.MigrationFailed, State.Failed);
stateMachines.addTransition(State.Migrating, Event.MigrationSucceeded, State.Destroyed);
stateMachines.addTransition(State.Migrating, Event.OperationSuccessed, State.Ready);
stateMachines.addTransition(State.Migrating, Event.OperationSucceeded, State.Ready);
stateMachines.addTransition(State.Migrating, Event.OperationFailed, State.Ready);
}
@ -318,9 +318,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager {
break;
}
} else if (data.getType() == DataObjectType.TEMPLATE && data.getDataStore().getRole() == DataStoreRole.Primary) {
result = this.stateMachines.transitTo(obj, event, null, templatePoolDao);
} else if (data.getType() == DataObjectType.SNAPSHOT && data.getDataStore().getRole() == DataStoreRole.Primary) {
result = this.stateMachines.transitTo(obj, event, null, snapshotDataStoreDao);
} else {
@ -380,7 +378,5 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager {
}
return vo;
}
}

2
engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java
View File

@ -415,7 +415,7 @@ public class VolumeObject implements VolumeInfo {
}
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);

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

@ -324,7 +324,7 @@ public class VolumeServiceImpl implements VolumeService {
DataObject vo = context.getVolume();
String errMsg = null;
if (result.isSuccess()) {
vo.processEvent(Event.OperationSuccessed, result.getAnswer());
vo.processEvent(Event.OperationSucceeded, result.getAnswer());
} else {
vo.processEvent(Event.OperationFailed);
errMsg = result.getResult();
@ -485,7 +485,7 @@ public class VolumeServiceImpl implements VolumeService {
VolumeApiResult apiResult = new VolumeApiResult(vo);
try {
if (result.isSuccess()) {
vo.processEvent(Event.OperationSuccessed);
vo.processEvent(Event.OperationSucceeded);
if (vo.getPassphraseId() != null) {
vo.deletePassphrase();
@ -741,7 +741,7 @@ public class VolumeServiceImpl implements VolumeService {
if (result.isSuccess()) {
((TemplateObject)templateOnPrimaryStoreObj).setInstallPath(result.getPath());
templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
} else {
templateOnPrimaryStoreObj.processEvent(Event.OperationFailed);
}
@ -761,7 +761,7 @@ public class VolumeServiceImpl implements VolumeService {
DataObject templateOnPrimaryStoreObj = context.destObj;
if (result.isSuccess()) {
templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
} else {
templateOnPrimaryStoreObj.processEvent(Event.OperationFailed);
}
@ -785,7 +785,7 @@ public class VolumeServiceImpl implements VolumeService {
return null;
}
templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer());
templateOnPrimaryStoreObj.processEvent(Event.OperationSucceeded, result.getAnswer());
createVolumeFromBaseImageAsync(context.volume, templateOnPrimaryStoreObj, context.dataStore, future);
return null;
}
@ -836,7 +836,7 @@ public class VolumeServiceImpl implements VolumeService {
String deployAsIsConfiguration = context.deployAsIsConfiguration;
if (result.isSuccess()) {
vo.processEvent(Event.OperationSuccessed, result.getAnswer());
vo.processEvent(Event.OperationSucceeded, result.getAnswer());
} else {
vo.processEvent(Event.OperationFailed);
@ -891,7 +891,7 @@ public class VolumeServiceImpl implements VolumeService {
}
volDao.update(volume.getId(), volume);
vo.processEvent(Event.OperationSuccessed);
vo.processEvent(Event.OperationSucceeded);
} else {
volResult.setResult(result.getResult());
@ -955,7 +955,7 @@ public class VolumeServiceImpl implements VolumeService {
throw new CloudRuntimeException(String.format("Unable to create template %s on primary storage %s: %s", templateOnPrimary.getImage(), destPrimaryDataStore, errMesg));
}
templateOnPrimary.processEvent(Event.OperationSuccessed);
templateOnPrimary.processEvent(Event.OperationSucceeded);
} catch (Throwable e) {
logger.debug("Failed to create template volume on storage", e);
@ -1428,7 +1428,7 @@ public class VolumeServiceImpl implements VolumeService {
logger.debug("Failed to prepare ready bypassed template: {} on primary storage: {}", srcTemplateInfo, templateOnPrimary);
throw new CloudRuntimeException(String.format("Failed to prepare ready bypassed template: %s on primary storage: %s", srcTemplateInfo, templateOnPrimary));
}
templateOnPrimary.processEvent(Event.OperationSuccessed);
templateOnPrimary.processEvent(Event.OperationSucceeded);
return templateOnPrimaryNow;
} finally {
revokeAccess(templateOnPrimary, destHost, destPrimaryDataStore);
@ -1683,7 +1683,7 @@ public class VolumeServiceImpl implements VolumeService {
apiResult.setResult(result.getResult());
event = Event.OperationFailed;
} else {
event = Event.OperationSuccessed;
event = Event.OperationSucceeded;
}
try {
@ -1789,8 +1789,8 @@ public class VolumeServiceImpl implements VolumeService {
return null;
}
srcVolume.processEvent(Event.OperationSuccessed);
destVolume.processEvent(Event.OperationSuccessed, result.getAnswer());
srcVolume.processEvent(Event.OperationSucceeded);
destVolume.processEvent(Event.OperationSucceeded, result.getAnswer());
srcVolume.getDataStore().delete(srcVolume);
future.complete(res);
} catch (Exception e) {
@ -1840,8 +1840,8 @@ public class VolumeServiceImpl implements VolumeService {
res.setResult(result.getResult());
future.complete(res);
} else {
srcVolume.processEvent(Event.OperationSuccessed); // back to Ready state in Volume table
destVolume.processEventOnly(Event.OperationSuccessed, result.getAnswer());
srcVolume.processEvent(Event.OperationSucceeded); // back to Ready state in Volume table
destVolume.processEventOnly(Event.OperationSucceeded, result.getAnswer());
future.complete(res);
}
} catch (Exception e) {
@ -1923,7 +1923,7 @@ public class VolumeServiceImpl implements VolumeService {
if (destVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
logger.info("Dest volume {} can be removed", destVolume);
destVolume.processEvent(Event.ExpungeRequested);
destVolume.processEvent(Event.OperationSuccessed);
destVolume.processEvent(Event.OperationSucceeded);
volDao.remove(destVolume.getId());
future.complete(res);
return null;
@ -1956,7 +1956,7 @@ public class VolumeServiceImpl implements VolumeService {
protected boolean destroySourceVolumeAfterMigration(Event destinationEvent, Answer destinationEventAnswer, VolumeInfo sourceVolume,
VolumeInfo destinationVolume, boolean retryExpungeVolumeAsync) {
sourceVolume.processEvent(Event.OperationSuccessed);
sourceVolume.processEvent(Event.OperationSucceeded);
destinationVolume.processEvent(destinationEvent, destinationEventAnswer);
VolumeVO sourceVolumeVo = ((VolumeObject) sourceVolume).getVolume();
@ -1972,7 +1972,7 @@ public class VolumeServiceImpl implements VolumeService {
if (sourceVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
logger.info("Source volume {} can be removed.", sourceVolumeVo);
sourceVolume.processEvent(Event.ExpungeRequested);
sourceVolume.processEvent(Event.OperationSuccessed);
sourceVolume.processEvent(Event.OperationSucceeded);
volDao.remove(sourceVolume.getId());
return true;
}
@ -2067,7 +2067,7 @@ public class VolumeServiceImpl implements VolumeService {
logger.debug("Failed to create dest volume {}, volume can be removed", destVolume);
destroyVolume(destVolume.getId());
destVolume.processEvent(Event.ExpungeRequested);
destVolume.processEvent(Event.OperationSuccessed);
destVolume.processEvent(Event.OperationSucceeded);
volDao.remove(destVolume.getId());
throw new CloudRuntimeException("Creation of a dest volume failed: " + createVolumeResult.getResult());
}
@ -2156,7 +2156,7 @@ public class VolumeServiceImpl implements VolumeService {
logger.debug("failed to clean up managed volume on storage", e);
}
} else {
srcVolume.processEvent(Event.OperationSuccessed);
srcVolume.processEvent(Event.OperationSucceeded);
destVolume.processEvent(Event.MigrationCopySucceeded, result.getAnswer());
volDao.updateUuid(srcVolume.getId(), destVolume.getId());
volDao.detachVolume(srcVolume.getId());
@ -2276,7 +2276,7 @@ public class VolumeServiceImpl implements VolumeService {
srcVolume.processEvent(Event.OperationFailed);
future.complete(res);
} else {
srcVolume.processEvent(Event.OperationSuccessed);
srcVolume.processEvent(Event.OperationSucceeded);
if (srcVolume.getStoragePoolType() == StoragePoolType.PowerFlex) {
future.complete(res);
return null;
@ -2363,7 +2363,7 @@ public class VolumeServiceImpl implements VolumeService {
for (Map.Entry<VolumeInfo, DataStore> entry : volumeToPool.entrySet()) {
VolumeInfo volume = entry.getKey();
snapshotMgr.cleanupSnapshotsByVolume(volume.getId());
volume.processEvent(Event.OperationSuccessed);
volume.processEvent(Event.OperationSucceeded);
}
future.complete(res);
}
@ -2431,7 +2431,7 @@ public class VolumeServiceImpl implements VolumeService {
}
} else {
vo.processEvent(Event.OperationSuccessed, result.getAnswer());
vo.processEvent(Event.OperationSucceeded, result.getAnswer());
if (vo.getSize() != null) {
// publish usage events
@ -2551,7 +2551,7 @@ public class VolumeServiceImpl implements VolumeService {
}
try {
volume.processEvent(Event.OperationSuccessed);
volume.processEvent(Event.OperationSucceeded);
} catch (Exception e) {
logger.debug("Failed to change volume state (after resize success)", e);
}
@ -2640,7 +2640,7 @@ public class VolumeServiceImpl implements VolumeService {
if (volume.getState() == State.NotUploaded || volume.getState() == State.UploadInProgress) {
VolumeObject volObj = (VolumeObject)volFactory.getVolume(volume.getId());
volObj.processEvent(Event.OperationSuccessed);
volObj.processEvent(Event.OperationSucceeded);
}
if (volInfo.getSize() > 0) {

4
engine/storage/volume/src/test/java/org/apache/cloudstack/storage/volume/VolumeObjectTest.java
View File

@ -147,7 +147,7 @@ public class VolumeObjectTest extends TestCase{
expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationRequested, Volume.Event.CopyRequested);
expectedResult.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
expectedResult.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);
@ -168,7 +168,7 @@ public class VolumeObjectTest extends TestCase{
expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyRequested, Volume.Event.MigrationCopyRequested);
expectedResult.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
expectedResult.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
expectedResult.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
expectedResult.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);

4
plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
View File

@ -453,8 +453,8 @@ public class StorPoolDataMotionStrategy implements DataMotionStrategy {
VolumeInfo destVolumeInfo = entry.getValue();
if (success) {
srcVolumeInfo.processEvent(Event.OperationSuccessed);
destVolumeInfo.processEvent(Event.OperationSuccessed);
srcVolumeInfo.processEvent(Event.OperationSucceeded);
destVolumeInfo.processEvent(Event.OperationSucceeded);
_volumeDao.updateUuid(srcVolumeInfo.getId(), destVolumeInfo.getId());

2
plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
View File

@ -201,7 +201,7 @@ public class StorPoolSnapshotStrategy implements SnapshotStrategy {
if (parent.getPath() != null && parent.getPath().equalsIgnoreCase(snapshot.getPath())) {
logger.debug("for empty delta snapshot, only mark it as destroyed in db");
snapshot.processEvent(Event.DestroyRequested);
snapshot.processEvent(Event.OperationSuccessed);
snapshot.processEvent(Event.OperationSucceeded);
deleted = true;
if (!resultIsSet) {
result = true;