Skip to content

Commit f46f58a

Browse files
sureshanapartiLocharla, Sandeep
sureshanaparti
authored and
Locharla, Sandeep
committed
Event typo fix (apache#12350)
1 parent 9e663b0 commit f46f58a

File tree

14 files changed

+65
-69
lines changed

14 files changed

+65
-69
lines changed

‎engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public DataObject createCacheObject(DataObject data, DataStore store) {
323323
if (result.isFailed()) {
324324
objOnCacheStore.processEvent(Event.OperationFailed);
325325
} else {
326-
objOnCacheStore.processEvent(Event.OperationSuccessed, result.getAnswer());
326+
objOnCacheStore.processEvent(Event.OperationSucceeded, result.getAnswer());
327327
objOnCacheStore.incRefCount();
328328
return objOnCacheStore;
329329
}

‎engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
401401
return answer;
402402
}
403403

404-
objOnImageStore.processEvent(Event.OperationSuccessed, answer);
404+
objOnImageStore.processEvent(Event.OperationSucceeded, answer);
405405

406406
objOnImageStore.processEvent(Event.CopyingRequested);
407407

@@ -432,7 +432,7 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
432432
throw e;
433433
}
434434

435-
objOnImageStore.processEvent(Event.OperationSuccessed);
435+
objOnImageStore.processEvent(Event.OperationSucceeded);
436436
deleteVolumeOnSecondaryStore(objOnImageStore);
437437
return answer;
438438
} else {

‎engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ private void handleCopyAsyncToSecondaryStorageAdaptive(SnapshotInfo snapshotInfo
10581058

10591059
//submit processEvent
10601060
if (StringUtils.isEmpty(errMsg)) {
1061-
snapshotInfo.processEvent(Event.OperationSuccessed);
1061+
snapshotInfo.processEvent(Event.OperationSucceeded);
10621062
} else {
10631063
snapshotInfo.processEvent(Event.OperationFailed);
10641064
}
@@ -1221,7 +1221,7 @@ else if (HypervisorType.VMware.equals(snapshotInfo.getHypervisorType()) || Hyper
12211221
// command to copy this data from cache to secondary storage. We
12221222
// then clean up the cache.
12231223

1224-
destOnStore.processEvent(Event.OperationSuccessed, copyCmdAnswer);
1224+
destOnStore.processEvent(Event.OperationSucceeded, copyCmdAnswer);
12251225

12261226
CopyCommand cmd = new CopyCommand(destOnStore.getTO(), destData.getTO(), primaryStorageDownloadWait,
12271227
VirtualMachineManager.ExecuteInSequence.value());
@@ -1271,7 +1271,7 @@ else if (HypervisorType.VMware.equals(snapshotInfo.getHypervisorType()) || Hyper
12711271

12721272
try {
12731273
if (StringUtils.isEmpty(errMsg)) {
1274-
snapshotInfo.processEvent(Event.OperationSuccessed);
1274+
snapshotInfo.processEvent(Event.OperationSucceeded);
12751275
}
12761276
else {
12771277
snapshotInfo.processEvent(Event.OperationFailed);
@@ -1404,7 +1404,7 @@ private void handleCreateNonManagedVolumeFromManagedSnapshot(SnapshotInfo snapsh
14041404

14051405
try {
14061406
if (StringUtils.isEmpty(errMsg)) {
1407-
snapshotInfo.processEvent(Event.OperationSuccessed);
1407+
snapshotInfo.processEvent(Event.OperationSucceeded);
14081408
}
14091409
else {
14101410
snapshotInfo.processEvent(Event.OperationFailed);
@@ -2366,7 +2366,7 @@ private void handlePostMigration(boolean success, Map<VolumeInfo, VolumeInfo> sr
23662366

23672367
_volumeDao.update(volumeVO.getId(), volumeVO);
23682368

2369-
_volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSuccessed, null, srcVolumeInfo, destVolumeInfo, false);
2369+
_volumeService.copyPoliciesBetweenVolumesAndDestroySourceVolumeAfterMigration(Event.OperationSucceeded, null, srcVolumeInfo, destVolumeInfo, false);
23702370

23712371
// Update the volume ID for snapshots on secondary storage
23722372
if (!_snapshotDao.listByVolumeId(srcVolumeInfo.getId()).isEmpty()) {
@@ -2704,7 +2704,7 @@ private void handleCreateTemplateFromManagedVolume(VolumeInfo volumeInfo, Templa
27042704

27052705
try {
27062706
if (StringUtils.isEmpty(errMsg)) {
2707-
volumeInfo.processEvent(Event.OperationSuccessed);
2707+
volumeInfo.processEvent(Event.OperationSucceeded);
27082708
}
27092709
else {
27102710
volumeInfo.processEvent(Event.OperationFailed);

‎engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ protected Void migrateDataCallBack(AsyncCallbackDispatcher<SecondaryStorageServi
257257
}
258258
} else {
259259
if (destData instanceof VolumeInfo) {
260-
((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
260+
((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
261261
} else {
262-
destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer);
262+
destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded, answer);
263263
}
264264
updateDataObject(srcData, destData);
265265
logger.debug("Deleting source data");

‎engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ protected Void copyTemplateToImageStoreCallback(AsyncCallbackDispatcher<Template
671671
TemplateApiResult res = new TemplateApiResult(tmplt);
672672
if (result.isSuccess()) {
673673
logger.info("Copied template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
674-
tmplt.processEvent(Event.OperationSuccessed, result.getAnswer());
674+
tmplt.processEvent(Event.OperationSucceeded, result.getAnswer());
675675
publishTemplateCreation(tmplt);
676676
} else {
677677
logger.warn("Failed to copy template [{}] to image store [{}].", tmplt.getUniqueName(), tmplt.getDataStore().getName());
@@ -824,7 +824,7 @@ protected Void createTemplateCallback(AsyncCallbackDispatcher<TemplateServiceImp
824824
}
825825

826826
try {
827-
template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
827+
template.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
828828
} catch (Exception e) {
829829
result.setResult(e.toString());
830830
if (parentCallback != null) {
@@ -1033,7 +1033,7 @@ public Void deleteTemplateCallback(AsyncCallbackDispatcher<TemplateServiceImpl,
10331033
CommandResult result = callback.getResult();
10341034
TemplateObject vo = context.getTemplate();
10351035
if (result.isSuccess()) {
1036-
vo.processEvent(Event.OperationSuccessed);
1036+
vo.processEvent(Event.OperationSucceeded);
10371037
} else {
10381038
vo.processEvent(Event.OperationFailed);
10391039
}
@@ -1093,7 +1093,7 @@ protected Void syncTemplateCallBack(AsyncCallbackDispatcher<TemplateServiceImpl,
10931093
// no change to existing template_store_ref, will try to re-sync later if other call triggers this sync operation, like copy template
10941094
} else {
10951095
// this will update install path properly, next time it will not sync anymore.
1096-
destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
1096+
destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
10971097
}
10981098
future.complete(res);
10991099
} catch (Exception e) {
@@ -1273,7 +1273,7 @@ protected Void copyTemplateCallBack(AsyncCallbackDispatcher<TemplateServiceImpl,
12731273
res.setResult(result.getResult());
12741274
destTemplate.processEvent(Event.OperationFailed);
12751275
} else {
1276-
destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
1276+
destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
12771277
}
12781278
future.complete(res);
12791279
} catch (Exception e) {
@@ -1298,7 +1298,7 @@ protected Void copyTemplateCrossZoneCallBack(AsyncCallbackDispatcher<TemplateSer
12981298
res.setResult(result.getResult());
12991299
destTemplate.processEvent(Event.OperationFailed);
13001300
} else {
1301-
destTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
1301+
destTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
13021302
}
13031303
future.complete(res);
13041304
} catch (Exception e) {
@@ -1384,7 +1384,7 @@ protected Void createDatadiskTemplateCallback(AsyncCallbackDispatcher<TemplateSe
13841384
TemplateApiResult dataDiskTemplateResult = new TemplateApiResult((TemplateObject)dataDiskTemplate);
13851385
try {
13861386
if (result.isSuccess()) {
1387-
dataDiskTemplate.processEvent(Event.OperationSuccessed, result.getAnswer());
1387+
dataDiskTemplate.processEvent(Event.OperationSucceeded, result.getAnswer());
13881388
} else {
13891389
dataDiskTemplate.processEvent(Event.OperationFailed);
13901390
dataDiskTemplateResult.setResult(result.getResult());

‎engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public SnapshotInfo backupSnapshot(SnapshotInfo snapshot) {
148148

149149
CreateObjectAnswer createSnapshotAnswer = new CreateObjectAnswer(snapTO);
150150

151-
snapshotOnImageStore.processEvent(Event.OperationSuccessed, createSnapshotAnswer);
151+
snapshotOnImageStore.processEvent(Event.OperationSucceeded, createSnapshotAnswer);
152152
SnapshotObject snapObj = castSnapshotInfoToSnapshotObject(snapshot);
153153
try {
154154
snapObj.processEvent(Snapshot.Event.OperationNotPerformed);

‎engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ protected Void createSnapshotAsyncCallback(AsyncCallbackDispatcher<SnapshotServi
227227
}
228228

229229
try {
230-
snapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
230+
snapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
231231
snapshot.processEvent(Snapshot.Event.OperationSucceeded);
232232
} catch (Exception e) {
233233
logger.debug("Failed to create snapshot: ", e);
@@ -515,7 +515,7 @@ protected Void copySnapshotAsyncCallback(AsyncCallbackDispatcher<SnapshotService
515515

516516
try {
517517
CopyCmdAnswer copyCmdAnswer = (CopyCmdAnswer)result.getAnswer();
518-
destSnapshot.processEvent(Event.OperationSuccessed, copyCmdAnswer);
518+
destSnapshot.processEvent(Event.OperationSucceeded, copyCmdAnswer);
519519
srcSnapshot.processEvent(Snapshot.Event.OperationSucceeded);
520520
snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), copyCmdAnswer);
521521
future.complete(snapResult);
@@ -540,7 +540,7 @@ protected Void copySnapshotZoneAsyncCallback(AsyncCallbackDispatcher<SnapshotSer
540540
}
541541
try {
542542
Answer answer = result.getAnswer();
543-
destSnapshot.processEvent(Event.OperationSuccessed);
543+
destSnapshot.processEvent(Event.OperationSucceeded);
544544
snapResult = new SnapshotResult(_snapshotFactory.getSnapshot(destSnapshot.getId(), destSnapshot.getDataStore()), answer);
545545
future.complete(snapResult);
546546
} catch (Exception e) {
@@ -583,7 +583,7 @@ protected Void deleteSnapshotCallback(AsyncCallbackDispatcher<SnapshotServiceImp
583583
res = new SnapshotResult(context.snapshot, null);
584584
res.setResult(result.getResult());
585585
} else {
586-
snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed);
586+
snapshot.processEvent(ObjectInDataStoreStateMachine.Event.OperationSucceeded);
587587
res = new SnapshotResult(context.snapshot, null);
588588
}
589589
} catch (Exception e) {
@@ -803,7 +803,7 @@ protected Void syncSnapshotCallBack(AsyncCallbackDispatcher<SnapshotServiceImpl,
803803
// no change to existing snapshot_store_ref, will try to re-sync later if other call triggers this sync operation
804804
} else {
805805
// this will update install path properly, next time it will not sync anymore.
806-
destSnapshot.processEvent(Event.OperationSuccessed, result.getAnswer());
806+
destSnapshot.processEvent(Event.OperationSucceeded, result.getAnswer());
807807
}
808808
future.complete(res);
809809
} catch (Exception e) {
@@ -833,7 +833,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
833833
try {
834834
SnapshotObject srcSnapshot = (SnapshotObject)snapshot;
835835
srcSnapshot.processEvent(Event.DestroyRequested);
836-
srcSnapshot.processEvent(Event.OperationSuccessed);
836+
srcSnapshot.processEvent(Event.OperationSucceeded);
837837

838838
srcSnapshot.processEvent(Snapshot.Event.OperationFailed);
839839

‎engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ protected Void createAsynCallback(AsyncCallbackDispatcher<DataObjectManagerImpl,
178178
}
179179

180180
try {
181-
objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
181+
objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
182182
} catch (NoTransitionException e) {
183183
try {
184184
objectInDataStoreMgr.update(objInStrore, ObjectInDataStoreStateMachine.Event.OperationFailed);
@@ -267,7 +267,7 @@ protected Void copyCallback(AsyncCallbackDispatcher<DataObjectManagerImpl, CopyC
267267
}
268268

269269
try {
270-
objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
270+
objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
271271
} catch (NoTransitionException e) {
272272
logger.debug("Failed to update copying state: ", e);
273273
try {
@@ -341,7 +341,7 @@ protected Void deleteAsynCallback(AsyncCallbackDispatcher<DataObjectManagerImpl,
341341

342342
} else {
343343
try {
344-
objectInDataStoreMgr.update(destObj, Event.OperationSuccessed);
344+
objectInDataStoreMgr.update(destObj, Event.OperationSucceeded);
345345
} catch (NoTransitionException e) {
346346
logger.debug("delete failed", e);
347347
} catch (ConcurrentOperationException e) {
@@ -365,7 +365,7 @@ public DataObject createInternalStateOnly(DataObject data, DataStore store) {
365365
event = ObjectInDataStoreStateMachine.Event.CreateRequested;
366366
objectInDataStoreMgr.update(objInStore, event);
367367

368-
objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSuccessed);
368+
objectInDataStoreMgr.update(objInStore, ObjectInDataStoreStateMachine.Event.OperationSucceeded);
369369
} catch (NoTransitionException e) {
370370
logger.debug("Failed to update state", e);
371371
throw new CloudRuntimeException("Failed to update state", e);

‎engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,27 +99,27 @@ public ObjectInDataStoreManagerImpl() {
9999
stateMachines.addTransition(State.Allocated, Event.CreateOnlyRequested, State.Creating);
100100
stateMachines.addTransition(State.Allocated, Event.DestroyRequested, State.Destroying);
101101
stateMachines.addTransition(State.Allocated, Event.OperationFailed, State.Failed);
102-
stateMachines.addTransition(State.Allocated, Event.OperationSuccessed, State.Ready);
102+
stateMachines.addTransition(State.Allocated, Event.OperationSucceeded, State.Ready);
103103
stateMachines.addTransition(State.Creating, Event.OperationFailed, State.Allocated);
104-
stateMachines.addTransition(State.Creating, Event.OperationSuccessed, State.Ready);
104+
stateMachines.addTransition(State.Creating, Event.OperationSucceeded, State.Ready);
105105
stateMachines.addTransition(State.Ready, Event.CopyingRequested, State.Copying);
106-
stateMachines.addTransition(State.Copying, Event.OperationSuccessed, State.Ready);
106+
stateMachines.addTransition(State.Copying, Event.OperationSucceeded, State.Ready);
107107
stateMachines.addTransition(State.Copying, Event.OperationFailed, State.Ready);
108108
stateMachines.addTransition(State.Ready, Event.DestroyRequested, State.Destroying);
109109
stateMachines.addTransition(State.Destroying, Event.DestroyRequested, State.Destroying);
110-
stateMachines.addTransition(State.Destroying, Event.OperationSuccessed, State.Destroyed);
110+
stateMachines.addTransition(State.Destroying, Event.OperationSucceeded, State.Destroyed);
111111
stateMachines.addTransition(State.Destroying, Event.OperationFailed, State.Destroying);
112112
stateMachines.addTransition(State.Failed, Event.DestroyRequested, State.Destroying);
113113
// TODO: further investigate why an extra event is sent when it is
114114
// already Ready for DownloadListener
115-
stateMachines.addTransition(State.Ready, Event.OperationSuccessed, State.Ready);
115+
stateMachines.addTransition(State.Ready, Event.OperationSucceeded, State.Ready);
116116
// State transitions for data object migration
117117
stateMachines.addTransition(State.Ready, Event.MigrateDataRequested, State.Migrating);
118118
stateMachines.addTransition(State.Ready, Event.CopyRequested, State.Copying);
119119
stateMachines.addTransition(State.Allocated, Event.MigrateDataRequested, State.Migrating);
120120
stateMachines.addTransition(State.Migrating, Event.MigrationFailed, State.Failed);
121121
stateMachines.addTransition(State.Migrating, Event.MigrationSucceeded, State.Destroyed);
122-
stateMachines.addTransition(State.Migrating, Event.OperationSuccessed, State.Ready);
122+
stateMachines.addTransition(State.Migrating, Event.OperationSucceeded, State.Ready);
123123
stateMachines.addTransition(State.Migrating, Event.OperationFailed, State.Ready);
124124
stateMachines.addTransition(State.Hidden, Event.DestroyRequested, State.Destroying);
125125
}
@@ -360,9 +360,7 @@ public boolean update(DataObject data, Event event) throws NoTransitionException
360360
break;
361361
}
362362
} else if (data.getType() == DataObjectType.TEMPLATE && data.getDataStore().getRole() == DataStoreRole.Primary) {
363-
364363
result = this.stateMachines.transitTo(obj, event, null, templatePoolDao);
365-
366364
} else if (data.getType() == DataObjectType.SNAPSHOT && data.getDataStore().getRole() == DataStoreRole.Primary) {
367365
result = this.stateMachines.transitTo(obj, event, null, snapshotDataStoreDao);
368366
} else {
@@ -422,7 +420,5 @@ public DataObjectInStore findObject(long objId, DataObjectType type, long dataSt
422420
}
423421

424422
return vo;
425-
426423
}
427-
428424
}

‎engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ protected Map<ObjectInDataStoreStateMachine.Event, Volume.Event> getMapOfEvents(
427427
}
428428
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.DestroyRequested, Volume.Event.DestroyRequested);
429429
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.ExpungeRequested, Volume.Event.ExpungingRequested);
430-
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSuccessed, Volume.Event.OperationSucceeded);
430+
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationSucceeded, Volume.Event.OperationSucceeded);
431431
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopySucceeded, Volume.Event.MigrationCopySucceeded);
432432
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.OperationFailed, Volume.Event.OperationFailed);
433433
mapOfEvents.put(ObjectInDataStoreStateMachine.Event.MigrationCopyFailed, Volume.Event.MigrationCopyFailed);

0 commit comments

Comments
 (0)