commit a8b24100a59a8ec9c917f89b1aa6978cc81e10df
author Lei Zhang <zhanglei@apache.org> Sat Dec 07 15:10:15 2019 +0800
committer Willem Jiang <willem.jiang@gmail.com> Tue Dec 10 10:33:24 2019 +0800
tree 84d4fe2937da8fb030ba511c2d8477b0343488ed
parent c29fecc9d81cbbb1ac303e19545ae1226e624713

SCB-1627 Method name ask rename to getAck

alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java

diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
index eab13f4..81b26a0 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
@@ -25,7 +25,7 @@
   default void disconnect() {
   }
 
-  default void ask(CompensateAckType type) {
+  default void getAck(CompensateAckType type) {
   }
 
   default boolean isWaiting() {

alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java

diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java
index cd1bf72..027046d 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java
@@ -55,7 +55,7 @@
       if (compensateAckCountDownLatch.getType() == CompensateAckType.Disconnected) {
         throw new CompensateConnectException("Omega connect exception");
       }else{
-        LOG.info("compensate ask "+ compensateAckCountDownLatch.getType().name());
+        LOG.info("compensate ack "+ compensateAckCountDownLatch.getType().name());
         if(compensateAckCountDownLatch.getType() == CompensateAckType.Failed){
           throw new CompensateAckFailedException("An exception is thrown inside the compensation method");
         }
@@ -76,7 +76,7 @@
   }
 
   @Override
-  public void ask(CompensateAckType type) {
+  public void getAck(CompensateAckType type) {
     if (compensateAckCountDownLatch != null) {
       compensateAckCountDownLatch.countDown(type);
     }

alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java

diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java
index 61548c0..dac6f21 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java
@@ -174,7 +174,7 @@
           .createTime(new Date())
           .localTxId(message.getLocalTxId()).build();
       omegaCallbacks.get(message.getServiceName()).get(message.getInstanceId())
-          .ask(CompensateAckType.Succeed);
+          .getAck(CompensateAckType.Succeed);
     } else if (message.getType().equals(EventType.TxCompensateAckFailedEvent.name())) {
       event = TxCompensateAckEvent.builder()
           .succeed(false)
@@ -185,7 +185,7 @@
           .createTime(new Date())
           .localTxId(message.getLocalTxId()).build();
       omegaCallbacks.get(message.getServiceName()).get(message.getInstanceId())
-          .ask(CompensateAckType.Failed);
+          .getAck(CompensateAckType.Failed);
     } else {
       ok = false;
     }