Skip to content

Commit 959c5ff

Browse files
sureshanapartisureshanaparti
committed
Merge branch '4.20' into 4.22
2 parents 7ff76cb + ca64406 commit 959c5ff

File tree

27 files changed

+150
-136
lines changed

27 files changed

+150
-136
lines changed

‎engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ enum State {
3535
Failed("Failed to download Template"),
3636
Hidden("The object is hidden from the user");
3737

38-
String _description;
38+
final String _description;
3939

40-
private State(String description) {
40+
State(String description) {
4141
_description = description;
4242
}
4343

@@ -50,7 +50,7 @@ enum Event {
5050
CreateRequested,
5151
CreateOnlyRequested,
5252
DestroyRequested,
53-
OperationSuccessed,
53+
OperationSucceeded,
5454
OperationFailed,
5555
CopyRequested,
5656
CopyingRequested,

‎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/integration-test/src/test/java/org/apache/cloudstack/storage/test/SnapshotTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public void setUp() {
269269
to.setSize(1000L);
270270
CopyCmdAnswer answer = new CopyCmdAnswer(to);
271271
templateOnStore.processEvent(Event.CreateOnlyRequested);
272-
templateOnStore.processEvent(Event.OperationSuccessed, answer);
272+
templateOnStore.processEvent(Event.OperationSucceeded, answer);
273273

274274
}
275275

‎engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public void setUp() {
244244
to.setSize(100L);
245245
CopyCmdAnswer answer = new CopyCmdAnswer(to);
246246
templateOnStore.processEvent(Event.CreateOnlyRequested);
247-
templateOnStore.processEvent(Event.OperationSuccessed, answer);
247+
templateOnStore.processEvent(Event.OperationSucceeded, answer);
248248

249249
}
250250

‎engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/VolumeTestVmware.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public void setUp() {
247247
to.setPath(this.getImageInstallPath());
248248
CopyCmdAnswer answer = new CopyCmdAnswer(to);
249249
templateOnStore.processEvent(Event.CreateOnlyRequested);
250-
templateOnStore.processEvent(Event.OperationSuccessed, answer);
250+
templateOnStore.processEvent(Event.OperationSucceeded, answer);
251251

252252
}
253253

‎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);

0 commit comments

Comments
 (0)