You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/12/10 02:33:40 UTC
[servicecomb-pack] 07/13: SCB-1627 Rename CompensateAskType to
CompensateAckType
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 21403ab4ec927d72fb77cacd88b923285f3a604d
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Mon Dec 2 13:55:45 2019 +0800
SCB-1627 Rename CompensateAskType to CompensateAckType
---
.../org/apache/servicecomb/pack/alpha/core/OmegaCallback.java | 4 ++--
.../fsm/{CompensateAskType.java => CompensateAckType.java} | 2 +-
.../servicecomb/pack/alpha/server/fsm/CompensateAskWait.java | 8 ++++----
.../servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java | 10 +++++-----
.../pack/alpha/server/fsm/GrpcSagaEventService.java | 6 +++---
5 files changed, 15 insertions(+), 15 deletions(-)
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 a8391ae..eab13f4 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
@@ -17,7 +17,7 @@
package org.apache.servicecomb.pack.alpha.core;
-import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAskType;
+import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAckType;
public interface OmegaCallback {
void compensate(TxEvent event);
@@ -25,7 +25,7 @@ public interface OmegaCallback {
default void disconnect() {
}
- default void ask(CompensateAskType type) {
+ default void ask(CompensateAckType type) {
}
default boolean isWaiting() {
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/CompensateAskType.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/CompensateAckType.java
similarity index 96%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/CompensateAskType.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/CompensateAckType.java
index 10ff79d..211b0c1 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/CompensateAskType.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/CompensateAckType.java
@@ -17,6 +17,6 @@
package org.apache.servicecomb.pack.alpha.core.fsm;
-public enum CompensateAskType {
+public enum CompensateAckType {
Failed,Succeed,Disconnected
}
\ No newline at end of file
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAskWait.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAskWait.java
index e5d918c..9dee861 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAskWait.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAskWait.java
@@ -18,20 +18,20 @@
package org.apache.servicecomb.pack.alpha.server.fsm;
import java.util.concurrent.CountDownLatch;
-import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAskType;
+import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAckType;
public class CompensateAskWait extends CountDownLatch {
- private CompensateAskType type;
+ private CompensateAckType type;
public CompensateAskWait(int count) {
super(count);
}
- public CompensateAskType getType() {
+ public CompensateAckType getType() {
return type;
}
- public void countDown(CompensateAskType type) {
+ public void countDown(CompensateAckType type) {
this.type = type;
super.countDown();
}
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 1624479..010ba6e 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
@@ -24,7 +24,7 @@ import org.apache.servicecomb.pack.alpha.core.OmegaCallback;
import org.apache.servicecomb.pack.alpha.core.TxEvent;
import org.apache.servicecomb.pack.alpha.core.exception.CompensateAckFailedException;
import org.apache.servicecomb.pack.alpha.core.exception.CompensateConnectException;
-import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAskType;
+import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAckType;
import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,11 +52,11 @@ class GrpcOmegaCallback implements OmegaCallback {
.build();
observer.onNext(command);
compensateAskWait.await();
- if (compensateAskWait.getType() == CompensateAskType.Disconnected) {
+ if (compensateAskWait.getType() == CompensateAckType.Disconnected) {
throw new CompensateConnectException("Omega connect exception");
}else{
LOG.info("compensate ask "+compensateAskWait.getType().name());
- if(compensateAskWait.getType() == CompensateAskType.Failed){
+ if(compensateAskWait.getType() == CompensateAckType.Failed){
throw new CompensateAckFailedException("An exception is thrown inside the compensation method");
}
}
@@ -71,12 +71,12 @@ class GrpcOmegaCallback implements OmegaCallback {
public void disconnect() {
observer.onCompleted();
if (compensateAskWait != null) {
- compensateAskWait.countDown(CompensateAskType.Disconnected);
+ compensateAskWait.countDown(CompensateAckType.Disconnected);
}
}
@Override
- public void ask(CompensateAskType type) {
+ public void ask(CompensateAckType type) {
if (compensateAskWait != null) {
compensateAskWait.countDown(type);
}
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 60fbdfb..61548c0 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
@@ -25,7 +25,7 @@ import java.util.Date;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.servicecomb.pack.alpha.core.OmegaCallback;
-import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAskType;
+import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAckType;
import org.apache.servicecomb.pack.alpha.core.fsm.event.TxCompensateAckEvent;
import org.apache.servicecomb.pack.alpha.core.fsm.event.base.BaseEvent;
import org.apache.servicecomb.pack.alpha.core.fsm.channel.ActorEventChannel;
@@ -174,7 +174,7 @@ public class GrpcSagaEventService extends TxEventServiceImplBase {
.createTime(new Date())
.localTxId(message.getLocalTxId()).build();
omegaCallbacks.get(message.getServiceName()).get(message.getInstanceId())
- .ask(CompensateAskType.Succeed);
+ .ask(CompensateAckType.Succeed);
} else if (message.getType().equals(EventType.TxCompensateAckFailedEvent.name())) {
event = TxCompensateAckEvent.builder()
.succeed(false)
@@ -185,7 +185,7 @@ public class GrpcSagaEventService extends TxEventServiceImplBase {
.createTime(new Date())
.localTxId(message.getLocalTxId()).build();
omegaCallbacks.get(message.getServiceName()).get(message.getInstanceId())
- .ask(CompensateAskType.Failed);
+ .ask(CompensateAckType.Failed);
} else {
ok = false;
}