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/incubator-servicecomb-saga.git
commit 38751840e52abd9fd39a7821cf4bd07f9096de25
Author: cherrylzhao <zhaoju...@126.com>
AuthorDate: Tue Aug 28 11:42:45 2018 +0800
SCB-856 Add info log for alpha GrpcTccEventService.
---
.../saga/alpha/server/tcc/GrpcTccEventService.java | 11 ++++++++++-
.../alpha/server/tcc/registry/TransactionEventRegistry.java | 11 +++++++++++
.../servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java | 9 +--------
3 files changed, 22 insertions(+), 9 deletions(-)
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
index 27410e2..e3b89b9 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java
@@ -18,10 +18,11 @@
package org.apache.servicecomb.saga.alpha.server.tcc;
import io.grpc.stub.StreamObserver;
+import java.lang.invoke.MethodHandles;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback;
-import
org.apache.servicecomb.saga.alpha.server.tcc.registry.OmegaCallbacksRegistry;
import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccCallbackEngine;
import
org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipateEventFactory;
+import
org.apache.servicecomb.saga.alpha.server.tcc.registry.OmegaCallbacksRegistry;
import
org.apache.servicecomb.saga.alpha.server.tcc.registry.TransactionEventRegistry;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
@@ -30,12 +31,16 @@ import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Grpc TCC event service implement.
*/
public class GrpcTccEventService extends
TccEventServiceGrpc.TccEventServiceImplBase {
+ private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private static final GrpcAck ALLOW =
GrpcAck.newBuilder().setAborted(false).build();
private static final GrpcAck REJECT =
GrpcAck.newBuilder().setAborted(true).build();
@@ -50,10 +55,12 @@ public class GrpcTccEventService extends
TccEventServiceGrpc.TccEventServiceImpl
@Override
public void onConnected(GrpcServiceConfig request,
StreamObserver<GrpcTccCoordinateCommand> responseObserver) {
OmegaCallbacksRegistry.register(request, responseObserver);
+ LOG.info("Established connection service [{}] instanceId [{}].",
request.getServiceName(), request.getInstanceId());
}
@Override
public void onTccTransactionStarted(GrpcTccTransactionStartedEvent request,
StreamObserver<GrpcAck> responseObserver) {
+ LOG.info("Received transaction start event, global tx id: {}",
request.getGlobalTxId());
responseObserver.onNext(ALLOW);
responseObserver.onCompleted();
}
@@ -67,6 +74,7 @@ public class GrpcTccEventService extends
TccEventServiceGrpc.TccEventServiceImpl
@Override
public void onTccTransactionEnded(GrpcTccTransactionEndedEvent request,
StreamObserver<GrpcAck> responseObserver) {
+ LOG.info("Received transaction end event, global tx id: {}",
request.getGlobalTxId());
responseObserver.onNext(tccCallbackEngine.execute(request) ? ALLOW :
REJECT);
responseObserver.onCompleted();
}
@@ -75,6 +83,7 @@ public class GrpcTccEventService extends
TccEventServiceGrpc.TccEventServiceImpl
public void onDisconnected(GrpcServiceConfig request,
StreamObserver<GrpcAck> responseObserver) {
OmegaCallback omegaCallback =
OmegaCallbacksRegistry.retrieveThenRemove(request.getServiceName(),
request.getInstanceId());
if (null != omegaCallback) {
+ LOG.info("Disconnect from alpha, service [{}] instanceId [{}].",
request.getServiceName(), request.getInstanceId());
omegaCallback.disconnect();
}
responseObserver.onNext(ALLOW);
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/TransactionEventRegistry.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/TransactionEventRegistry.java
index 2304f52..d135a8b 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/TransactionEventRegistry.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/TransactionEventRegistry.java
@@ -17,17 +17,22 @@
package org.apache.servicecomb.saga.alpha.server.tcc.registry;
+import java.lang.invoke.MethodHandles;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Manage TCC transaction event.
*/
public final class TransactionEventRegistry {
+ private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
private final static Map<String, Set<ParticipatedEvent>> REGISTRY = new
ConcurrentHashMap<>();
/**
@@ -39,6 +44,12 @@ public final class TransactionEventRegistry {
REGISTRY
.computeIfAbsent(participateEvent.getGlobalTxId(), key -> new
LinkedHashSet<>())
.add(participateEvent);
+
+ LOG.info("Registered participated event, global tx: {}, local tx: {},
parent id: {}, "
+ + "confirm: {}, cancel: {}, status: {}, service [{}] instanceId
[{}]",
+ participateEvent.getGlobalTxId(), participateEvent.getLocalTxId(),
participateEvent.getParentTxId(),
+ participateEvent.getConfirmMethod(),
participateEvent.getCancelMethod(), participateEvent.getStatus(),
+ participateEvent.getServiceName(), participateEvent.getInstanceId());
}
/**
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
index 60b6c57..4bbfa45 100644
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
+++
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
@@ -31,9 +31,9 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.servicecomb.saga.alpha.server.AlphaApplication;
import
org.apache.servicecomb.saga.alpha.server.tcc.callback.GrpcOmegaTccCallback;
+import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent;
import
org.apache.servicecomb.saga.alpha.server.tcc.registry.OmegaCallbacksRegistry;
import
org.apache.servicecomb.saga.alpha.server.tcc.registry.TransactionEventRegistry;
-import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent;
import org.apache.servicecomb.saga.common.TransactionStatus;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
@@ -46,7 +46,6 @@ import
org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEve
import
org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -99,11 +98,6 @@ public class AlphaTccServerTest {
clientChannel = null;
}
- @Before
- public void before() {
- System.out.println(" globalTxId " + globalTxId);
- }
-
@After
public void after() {
blockingStub.onDisconnected(serviceConfig);
@@ -233,7 +227,6 @@ public class AlphaTccServerTest {
assertThat(command.getServiceName(), is(serviceName));
assertThat(result.getAborted(), is(false));
-
}
private GrpcTccParticipatedEvent newParticipatedEvent(String status) {
