This is an automated email from the ASF dual-hosted git repository. zhanglei pushed a commit to branch SCB-1321 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 00dc53c436a07b757b2f575c1d4d1cf41a694909 Author: Lei Zhang <[email protected]> AuthorDate: Wed Jul 3 10:50:49 2019 +0800 SCB-1321 await wait 2 seconds --- .../pack/alpha/fsm/SagaIntegrationTest.java | 22 +++++++++++----------- .../alpha/server/fsm/AlphaIntegrationFsmTest.java | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java index 9a65bfb..7fbf843 100644 --- a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java +++ b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java @@ -57,7 +57,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMMITTED @@ -81,7 +81,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMPENSATED @@ -104,7 +104,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMPENSATED @@ -129,7 +129,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMPENSATED @@ -155,7 +155,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMPENSATED @@ -181,7 +181,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMPENSATED @@ -207,7 +207,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMPENSATED @@ -233,7 +233,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.SUSPENDED @@ -286,7 +286,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMMITTED @@ -312,7 +312,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMMITTED @@ -338,7 +338,7 @@ public class SagaIntegrationTest { sagaEventBus.post(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); if(sagaData != null){ return sagaData.getLastState() == SagaActorState.COMPENSATED diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java index 3080e2c..27f5fd3 100644 --- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java +++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java @@ -93,7 +93,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().sagaSuccessfulEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMMITTED; }); @@ -115,7 +115,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().firstTxAbortedEvents(globalTxId, localTxId_1).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -137,7 +137,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().middleTxAbortedEvents(globalTxId, localTxId_1, localTxId_2).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -187,7 +187,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().receivedRemainingEventAfterFirstTxAbortedEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -212,7 +212,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().sagaAbortedEventAfterAllTxEndedsEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -237,7 +237,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().omegaSendSagaTimeoutEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.SUSPENDED; }); @@ -286,7 +286,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().successfulWithTxConcurrentEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMMITTED; }); @@ -310,7 +310,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().successfulWithTxConcurrentCrossEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMMITTED; }); @@ -334,7 +334,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().lastTxAbortedEventWithTxConcurrentEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMPENSATED; }); @@ -358,7 +358,7 @@ public class AlphaIntegrationFsmTest { omegaEventSender.getOmegaEventSagaSimulator().duplicateTxOnFailureEvents(globalTxId, localTxId_1, localTxId_2, localTxId_3).stream().forEach( event -> { omegaEventSender.getBlockingStub().onTxEvent(event); }); - await().atMost(1, SECONDS).until(() -> { + await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getSagaData(globalTxId); return sagaData !=null && sagaData.getLastState()==SagaActorState.COMPENSATED; });
