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 2018/09/27 23:07:35 UTC
[incubator-servicecomb-saga] branch master updated (5350a86 ->
6a68423)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.
from 5350a86 SCB-909 Revise copyright space.
new c255277 SCB-909 Optimize test case of omega load balance sender.
new 8a7dcbb SCB-909 Add fail fast mechanism when all alpha is down.
new c1aee5d SCB-909 Make omega fail fast mechanism configurable.
new 6a68423 SCB-909 Add TCC alpha retry logic when send coordinate command failed.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servicecomb/saga/alpha/server/AlphaConfig.java | 10 +-
.../server/tcc/callback/OmegaCallbackWrapper.java | 23 +++-
.../server/tcc/callback/TccCallbackEngine.java | 1 +
.../server/tcc/callback/TccPendingTaskRunner.java | 36 ++---
.../alpha/server/tcc/TccCallbackEngineTest.java | 151 +++++++++++++++++++++
.../connector/grpc/core/GrpcOnErrorHandler.java | 18 ++-
.../connector/grpc/core/LoadBalanceContext.java | 4 +-
.../grpc/core/LoadBalanceContextBuilder.java | 7 +-
.../{tcc => }/LoadBalanceContextBuilderTest.java | 6 +-
.../grpc/{tcc => }/LoadBalanceSenderTestBase.java | 2 +-
.../{ => saga}/RetryableMessageSenderTest.java | 2 +-
.../SagaLoadBalanceSenderWithTLSTest.java} | 10 +-
.../SagaLoadBalancedSenderTest.java} | 28 ++--
.../SagaLoadBalancedSenderTestBase.java} | 4 +-
.../{ => tcc}/GrpcTccClientMessageSenderTest.java | 2 +-
.../grpc/tcc/SagaLoadBalanceSenderTest.java | 35 -----
.../grpc/tcc/TccLoadBalanceSenderTest.java | 30 +++-
.../saga/omega/spring/OmegaSpringConfig.java | 12 +-
18 files changed, 289 insertions(+), 92 deletions(-)
copy omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/PendingTaskRunner.java => alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java (68%)
create mode 100644 alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/{tcc => }/LoadBalanceContextBuilderTest.java (98%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/{tcc => }/LoadBalanceSenderTestBase.java (96%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/{ => saga}/RetryableMessageSenderTest.java (98%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/{LoadBalanceClusterMessageSenderWithTLSTest.java => saga/SagaLoadBalanceSenderWithTLSTest.java} (93%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/{LoadBalancedClusterMessageSenderTest.java => saga/SagaLoadBalancedSenderTest.java} (92%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/{LoadBalancedClusterMessageSenderTestBase.java => saga/SagaLoadBalancedSenderTestBase.java} (98%)
rename omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/{ => tcc}/GrpcTccClientMessageSenderTest.java (99%)
delete mode 100644 omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/SagaLoadBalanceSenderTest.java
[incubator-servicecomb-saga] 01/04: SCB-909 Optimize test case of
omega load balance sender.
Posted by ni...@apache.org.
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 c2552771abb7f1011ba2b9751f436608f43e639d
Author: cherrylzhao <zh...@126.com>
AuthorDate: Tue Sep 25 12:13:08 2018 +0800
SCB-909 Optimize test case of omega load balance sender.
---
.../{tcc => }/LoadBalanceContextBuilderTest.java | 2 +-
.../grpc/{tcc => }/LoadBalanceSenderTestBase.java | 2 +-
.../{ => saga}/RetryableMessageSenderTest.java | 2 +-
.../SagaLoadBalanceSenderWithTLSTest.java} | 8 ++---
.../SagaLoadBalancedSenderTest.java} | 6 ++--
.../SagaLoadBalancedSenderTestBase.java} | 4 +--
.../{ => tcc}/GrpcTccClientMessageSenderTest.java | 2 +-
.../grpc/tcc/SagaLoadBalanceSenderTest.java | 35 ----------------------
.../grpc/tcc/TccLoadBalanceSenderTest.java | 1 +
9 files changed, 14 insertions(+), 48 deletions(-)
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/LoadBalanceContextBuilderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
similarity index 99%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/LoadBalanceContextBuilderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
index 6be785b..5388777 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/LoadBalanceContextBuilderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.saga.omega.connector.grpc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/LoadBalanceSenderTestBase.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceSenderTestBase.java
similarity index 96%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/LoadBalanceSenderTestBase.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceSenderTestBase.java
index a2691a7..f7c8111 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/LoadBalanceSenderTestBase.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceSenderTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
+package org.apache.servicecomb.saga.omega.connector.grpc;
import io.grpc.Server;
import java.util.HashMap;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/RetryableMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSenderTest.java
similarity index 98%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/RetryableMessageSenderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSenderTest.java
index 9f97eb6..6f29708 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/RetryableMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/RetryableMessageSenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.saga.omega.connector.grpc.saga;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceClusterMessageSenderWithTLSTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
similarity index 94%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceClusterMessageSenderWithTLSTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
index c9d0e02..88e7b84 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceClusterMessageSenderWithTLSTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.saga.omega.connector.grpc.saga;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
@@ -38,16 +38,16 @@ import java.net.InetSocketAddress;
import java.util.Arrays;
import java.util.concurrent.Callable;
import javax.net.ssl.SSLException;
+import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
import org.apache.servicecomb.saga.omega.connector.grpc.core.TransactionType;
-import org.apache.servicecomb.saga.omega.connector.grpc.saga.SagaLoadBalanceSender;
import org.apache.servicecomb.saga.omega.context.ServiceConfig;
import org.junit.BeforeClass;
import org.junit.Test;
-public class LoadBalanceClusterMessageSenderWithTLSTest extends LoadBalancedClusterMessageSenderTestBase {
+public class SagaLoadBalanceSenderWithTLSTest extends SagaLoadBalancedSenderTestBase {
@Override
protected SagaLoadBalanceSender newMessageSender(String[] addresses) {
@@ -101,7 +101,7 @@ public class LoadBalanceClusterMessageSenderWithTLSTest extends LoadBalancedClus
}
private static SslContextBuilder getSslContextBuilder() {
- ClassLoader classLoader = LoadBalanceClusterMessageSenderWithTLSTest.class.getClassLoader();
+ ClassLoader classLoader = SagaLoadBalanceSenderWithTLSTest.class.getClassLoader();
SslContextBuilder sslClientContextBuilder = SslContextBuilder.forServer(
new File(classLoader.getResource("server.crt").getFile()),
new File(classLoader.getResource("server.pem").getFile()))
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
similarity index 97%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
index 1ffdb3b..193d7ec 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.saga.omega.connector.grpc.saga;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
import static java.lang.Thread.State.WAITING;
@@ -36,11 +36,11 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Callable;
+import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
import org.apache.servicecomb.saga.omega.connector.grpc.core.TransactionType;
-import org.apache.servicecomb.saga.omega.connector.grpc.saga.SagaLoadBalanceSender;
import org.apache.servicecomb.saga.omega.context.ServiceConfig;
import org.apache.servicecomb.saga.omega.transaction.MessageSender;
import org.apache.servicecomb.saga.omega.transaction.OmegaException;
@@ -52,7 +52,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.mockito.Mockito;
-public class LoadBalancedClusterMessageSenderTest extends LoadBalancedClusterMessageSenderTestBase {
+public class SagaLoadBalancedSenderTest extends SagaLoadBalancedSenderTestBase {
@Override
protected SagaLoadBalanceSender newMessageSender(String[] addresses) {
AlphaClusterConfig clusterConfig = AlphaClusterConfig.builder()
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTestBase.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
similarity index 98%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTestBase.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
index 4e96bcd..efefc15 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSenderTestBase.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTestBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.saga.omega.connector.grpc.saga;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.junit.Assert.fail;
@@ -46,7 +46,7 @@ import org.junit.AfterClass;
import io.grpc.Server;
import io.grpc.stub.StreamObserver;
-public abstract class LoadBalancedClusterMessageSenderTestBase {
+public abstract class SagaLoadBalancedSenderTestBase {
protected static final int[] ports = {8080, 8090};
protected static final Map<Integer, Server> servers = new HashMap<>();
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/GrpcTccClientMessageSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
similarity index 99%
rename from omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/GrpcTccClientMessageSenderTest.java
rename to omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
index 931e275..0c425b0 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/GrpcTccClientMessageSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/GrpcTccClientMessageSenderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.servicecomb.saga.omega.connector.grpc;
+package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/SagaLoadBalanceSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/SagaLoadBalanceSenderTest.java
deleted file mode 100644
index 3adeee7..0000000
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/SagaLoadBalanceSenderTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.servicecomb.saga.omega.connector.grpc.tcc;
-
-import org.junit.After;
-import org.junit.Before;
-
-public class SagaLoadBalanceSenderTest {
-
- @Before
- public void setup() {
-
- }
-
- @After
- public void teardown() {
-
- }
-
-}
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
index ea7cebf..af1085a 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
@@ -43,6 +43,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import org.apache.servicecomb.saga.common.TransactionStatus;
import org.apache.servicecomb.saga.omega.connector.grpc.AlphaClusterConfig;
+import org.apache.servicecomb.saga.omega.connector.grpc.LoadBalanceSenderTestBase;
import org.apache.servicecomb.saga.omega.connector.grpc.core.FastestSender;
import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContext;
import org.apache.servicecomb.saga.omega.connector.grpc.core.LoadBalanceContextBuilder;
[incubator-servicecomb-saga] 04/04: SCB-909 Add TCC alpha retry
logic when send coordinate command failed.
Posted by ni...@apache.org.
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 6a68423367bcd1acb970bfa25b36f94ca2d58980
Author: cherrylzhao <zh...@126.com>
AuthorDate: Wed Sep 26 16:09:37 2018 +0800
SCB-909 Add TCC alpha retry logic when send coordinate command failed.
---
.../servicecomb/saga/alpha/server/AlphaConfig.java | 10 +-
.../server/tcc/callback/OmegaCallbackWrapper.java | 23 +++-
.../server/tcc/callback/TccCallbackEngine.java | 1 +
.../server/tcc/callback/TccPendingTaskRunner.java | 63 +++++++++
.../alpha/server/tcc/TccCallbackEngineTest.java | 151 +++++++++++++++++++++
5 files changed, 244 insertions(+), 4 deletions(-)
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
index b8c1be2..bc4bc59 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java
@@ -35,6 +35,7 @@ import org.apache.servicecomb.saga.alpha.core.TxConsistentService;
import org.apache.servicecomb.saga.alpha.core.TxEventRepository;
import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository;
import org.apache.servicecomb.saga.alpha.server.tcc.GrpcTccEventService;
+import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccPendingTaskRunner;
import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -99,7 +100,14 @@ class AlphaConfig {
}
@Bean
- GrpcTccEventService grpcTccEventService(TccTxEventService tccTxEventService) {
+ TccPendingTaskRunner tccPendingTaskRunner() {
+ return new TccPendingTaskRunner(delay);
+ }
+
+ @Bean
+ GrpcTccEventService grpcTccEventService(TccTxEventService tccTxEventService, TccPendingTaskRunner tccPendingTaskRunner) {
+ tccPendingTaskRunner.start();
+ Runtime.getRuntime().addShutdownHook(new Thread(() -> tccPendingTaskRunner.shutdown()));
return new GrpcTccEventService(tccTxEventService);
}
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
index 64d624a..475489d 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java
@@ -17,6 +17,7 @@
package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+import java.util.concurrent.BlockingQueue;
import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
import org.apache.servicecomb.saga.common.TransactionStatus;
import org.springframework.stereotype.Component;
@@ -24,14 +25,30 @@ import org.springframework.stereotype.Component;
@Component
public class OmegaCallbackWrapper implements OmegaCallback {
+ private final BlockingQueue<Runnable> pendingTasks;
+
+ public OmegaCallbackWrapper(
+ TccPendingTaskRunner tccPendingTaskRunner) {
+ this.pendingTasks = tccPendingTaskRunner.getPendingTasks();
+ }
+
+
@Override
public void invoke(ParticipatedEvent event, TransactionStatus status) {
- OmegaCallback omegaCallback = OmegaCallbacksRegistry.retrieve(event.getServiceName(), event.getInstanceId());
+ OmegaCallback omegaCallback;
+ try {
+ omegaCallback = OmegaCallbacksRegistry.retrieve(event.getServiceName(), event.getInstanceId());
+ } catch (Exception e) {
+ pendingTasks.offer(() -> invoke(event, status));
+ throw e;
+ }
+
try {
omegaCallback.invoke(event, status);
- } catch (Exception ex) {
+ } catch (Exception e) {
OmegaCallbacksRegistry.remove(event.getServiceName(), event.getInstanceId());
- throw ex;
+ pendingTasks.offer(() -> invoke(event, status));
+ throw e;
}
}
}
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
index 48cbdba..1a55d19 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java
@@ -47,6 +47,7 @@ public class TccCallbackEngine implements CallbackEngine {
@Override
public boolean execute(GlobalTxEvent request) {
boolean result = true;
+ // TODO if tcc end event was triggered by many times, we should ensure coordinated event won't be invoke again.
List<TccTxEvent> events = tccTxEventRepository.findByGlobalTxIdAndTxType(request.getGlobalTxId(), TccTxType.PARTICIPATED).orElse(
Lists.newArrayList());
for (TccTxEvent event : events) {
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java
new file mode 100644
index 0000000..b847f65
--- /dev/null
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccPendingTaskRunner.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.servicecomb.saga.alpha.server.tcc.callback;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.lang.invoke.MethodHandles;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TccPendingTaskRunner {
+
+ private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+
+ private final BlockingQueue<Runnable> pendingTasks = new LinkedBlockingQueue<>();
+
+ private final int delay;
+
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ public TccPendingTaskRunner(int delay) {
+ this.delay = delay;
+ }
+
+ public void start() {
+ scheduler.scheduleWithFixedDelay(() -> {
+ try {
+ pendingTasks.take().run();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ } catch (Exception e) {
+ LOG.error(e.getMessage());
+ }
+ }, 0, delay, MILLISECONDS);
+ }
+
+ public void shutdown() {
+ scheduler.shutdown();
+ }
+
+ public BlockingQueue<Runnable> getPendingTasks() {
+ return pendingTasks;
+ }
+}
diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
new file mode 100644
index 0000000..6278902
--- /dev/null
+++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngineTest.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.servicecomb.saga.alpha.server.tcc;
+
+import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import io.grpc.stub.StreamObserver;
+import java.util.UUID;
+import org.apache.servicecomb.saga.alpha.server.AlphaApplication;
+import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbacksRegistry;
+import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccCallbackEngine;
+import org.apache.servicecomb.saga.alpha.server.tcc.jpa.GlobalTxEvent;
+import org.apache.servicecomb.saga.alpha.server.tcc.jpa.ParticipatedEvent;
+import org.apache.servicecomb.saga.alpha.server.tcc.jpa.TccTxType;
+import org.apache.servicecomb.saga.alpha.server.tcc.service.TccTxEventService;
+import org.apache.servicecomb.saga.common.TransactionStatus;
+import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {AlphaApplication.class},
+ properties = {
+ "alpha.server.host=0.0.0.0",
+ "alpha.server.port=8092",
+ "alpha.compensation.retry.delay=30"
+ })
+public class TccCallbackEngineTest {
+
+ @Autowired
+ private TccCallbackEngine tccCallbackEngine;
+
+ @Autowired
+ private TccTxEventService tccTxEventService;
+
+ private final String globalTxId = UUID.randomUUID().toString();
+ private final String localTxId = UUID.randomUUID().toString();
+ private final String parentTxId = UUID.randomUUID().toString();
+ private final String confirmMethod = "confirm";
+ private final String cancelMethod = "cancel";
+
+ private final String serviceName = uniquify("serviceName");
+ private final String instanceId = uniquify("instanceId");
+
+ private final GrpcServiceConfig serviceConfig = GrpcServiceConfig.newBuilder()
+ .setServiceName(serviceName)
+ .setInstanceId(instanceId)
+ .build();
+
+ private final GrpcServiceConfig serviceConfig2 = GrpcServiceConfig.newBuilder()
+ .setServiceName(serviceName)
+ .setInstanceId(uniquify("instanceId"))
+ .build();
+
+ private ParticipatedEvent participatedEvent;
+ private GlobalTxEvent tccEndEvent;
+
+ @Before
+ public void init() {
+ participatedEvent = new ParticipatedEvent(serviceName, instanceId, globalTxId, localTxId,
+ parentTxId, confirmMethod, cancelMethod, TransactionStatus.Succeed.name());
+
+ tccEndEvent = new GlobalTxEvent(serviceName, instanceId, globalTxId,
+ localTxId, parentTxId, TccTxType.ENDED.name(), TransactionStatus.Succeed.name());
+ }
+
+ @After
+ public void teardown() {
+ }
+
+ @Test
+ public void sendCoordinateCommandAfterTccEnd() {
+ StreamObserver responseObserver = mock(StreamObserver.class);
+ OmegaCallbacksRegistry.register(serviceConfig, responseObserver);
+
+ tccTxEventService.onParticipatedEvent(participatedEvent);
+ tccTxEventService.onParticipatedEvent(participatedEvent);
+
+ tccTxEventService.onTccEndedEvent(tccEndEvent);
+
+ verify(responseObserver).onNext(any());
+ }
+
+ @Test
+ public void sendCoordinateFailedForOmegaDown() throws InterruptedException {
+ StreamObserver responseObserver = mock(StreamObserver.class);
+ doThrow(IllegalArgumentException.class).when(responseObserver).onNext(any());
+ OmegaCallbacksRegistry.register(serviceConfig, responseObserver);
+
+ tccTxEventService.onParticipatedEvent(participatedEvent);
+ boolean result = tccCallbackEngine.execute(tccEndEvent);
+ assertThat(result, is(false));
+
+ Thread.sleep(1000);
+ verify(responseObserver).onNext(any());
+
+ try {
+ OmegaCallbacksRegistry.retrieve(serviceName, instanceId);
+ } catch (Exception ex) {
+ assertThat(ex.getMessage().startsWith("No such omega callback found for service"), is(true));
+ }
+ }
+
+ @Test
+ public void doRetryCoordinateTillOmegaReceived() throws InterruptedException {
+ StreamObserver failedResponseObserver = mock(StreamObserver.class);
+ doThrow(IllegalArgumentException.class).when(failedResponseObserver).onNext(any());
+ OmegaCallbacksRegistry.register(serviceConfig, failedResponseObserver);
+
+ tccTxEventService.onParticipatedEvent(participatedEvent);
+ boolean result = tccCallbackEngine.execute(tccEndEvent);
+ assertThat(result, is(false));
+
+ Thread.sleep(1000);
+
+ StreamObserver succeedResponseObserver = mock(StreamObserver.class);
+ OmegaCallbacksRegistry.register(serviceConfig2, succeedResponseObserver);
+
+ Thread.sleep(1000);
+ verify(failedResponseObserver).onNext(any());
+ verify(succeedResponseObserver).onNext(any());
+ }
+}
[incubator-servicecomb-saga] 02/04: SCB-909 Add fail fast mechanism
when all alpha is down.
Posted by ni...@apache.org.
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 8a7dcbb0f42523252e2e5533b8dce7689280d3d9
Author: cherrylzhao <zh...@126.com>
AuthorDate: Tue Sep 25 15:48:27 2018 +0800
SCB-909 Add fail fast mechanism when all alpha is down.
---
.../connector/grpc/core/GrpcOnErrorHandler.java | 7 +++++-
.../grpc/saga/SagaLoadBalancedSenderTest.java | 14 +++++++----
.../grpc/tcc/TccLoadBalanceSenderTest.java | 27 +++++++++++++++++++++-
3 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
index 7ab02a1..65d231a 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
@@ -21,6 +21,7 @@ import com.google.common.base.Supplier;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
import org.apache.servicecomb.saga.omega.transaction.MessageSender;
import org.apache.servicecomb.saga.omega.transaction.OmegaException;
@@ -64,7 +65,11 @@ public class GrpcOnErrorHandler {
@Override
public MessageSender get() {
try {
- return reconnectedSenders.take();
+ MessageSender messageSender = reconnectedSenders.poll(5, TimeUnit.SECONDS);
+ if (null == messageSender) {
+ throw new OmegaException("Failed to get reconnected sender, all alpha server is down.");
+ }
+ return messageSender;
} catch (InterruptedException e) {
throw new OmegaException("Failed to get reconnected sender", e);
}
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
index 193d7ec..58a49e4 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.saga.omega.connector.grpc.saga;
import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
-import static java.lang.Thread.State.WAITING;
+import static java.lang.Thread.State.TERMINATED;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.Matchers.contains;
@@ -254,16 +254,20 @@ public class SagaLoadBalancedSenderTest extends SagaLoadBalancedSenderTestBase {
final Thread thread = new Thread(new Runnable() {
@Override
public void run() {
- messageSender.send(event);
+ try {
+ messageSender.send(event);
+ } catch (OmegaException ex) {
+ assertThat(ex.getMessage().endsWith("all alpha server is down."), is(true));
+ }
}
});
thread.start();
// we don't want to keep sending on cluster down
- await().atMost(2, SECONDS).until(new Callable<Boolean>() {
+ await().atMost(10, SECONDS).until(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
- return thread.isAlive() && thread.getState().equals(WAITING);
+ return thread.getState().equals(TERMINATED);
}
});
@@ -276,12 +280,14 @@ public class SagaLoadBalancedSenderTest extends SagaLoadBalancedSenderTestBase {
startServerOnPort(8080);
startServerOnPort(8090);
+ messageSender.send(event);
await().atMost(2, SECONDS).until(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
return connected.get(8080).size() == 2 || connected.get(8090).size() == 2;
}
});
+
await().atMost(2, SECONDS).until(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
index af1085a..f396e0e 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
@@ -35,6 +35,7 @@ import com.google.common.collect.Maps;
import io.grpc.Server;
import io.grpc.ServerBuilder;
import io.grpc.netty.NettyServerBuilder;
+import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.Iterator;
import java.util.Map;
@@ -211,6 +212,31 @@ public class TccLoadBalanceSenderTest extends LoadBalanceSenderTestBase {
assertThat(eventsMap.get(8080).size(), is(3));
}
+ @Test
+ public void failFastWhenAllServerWasDown() throws IOException {
+ tccLoadBalanceSender.onConnected();
+ await().atMost(2, TimeUnit.SECONDS).until(new Callable<Boolean>() {
+ @Override
+ public Boolean call() {
+ return connected.get(8080).size() == 1 && connected.get(8090).size() == 1;
+ }
+ });
+ assertThat((connected.get(8080).size() == 1 && connected.get(8090).size() == 1), is(true));
+
+ for (Server each : servers.values()) {
+ each.shutdownNow();
+ }
+
+ try {
+ tccLoadBalanceSender.participate(participatedEvent);
+ } catch (OmegaException ex) {
+ assertThat(ex.getMessage().endsWith("all alpha server is down."), is(true));
+ }
+ for (Integer each : ports) {
+ startServerOnPort(each);
+ }
+ }
+
@Test(expected = OmegaException.class)
public void participateFailedThenAbort() {
TccMessageSender failedSender = mock(GrpcTccClientMessageSender.class);
@@ -285,5 +311,4 @@ public class TccLoadBalanceSenderTest extends LoadBalanceSenderTestBase {
Assert.assertThat(connected.get(8080), contains("Connected " + serviceName, "Disconnected " + serviceName));
Assert.assertThat(connected.get(8090), contains("Connected " + serviceName, "Disconnected " + serviceName));
}
-
}
[incubator-servicecomb-saga] 03/04: SCB-909 Make omega fail fast
mechanism configurable.
Posted by ni...@apache.org.
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 c1aee5de25c54c78ae60786b3f49d7d83fe504e2
Author: cherrylzhao <zh...@126.com>
AuthorDate: Tue Sep 25 16:12:41 2018 +0800
SCB-909 Make omega fail fast mechanism configurable.
---
.../saga/omega/connector/grpc/core/GrpcOnErrorHandler.java | 13 ++++++++++---
.../saga/omega/connector/grpc/core/LoadBalanceContext.java | 4 ++--
.../connector/grpc/core/LoadBalanceContextBuilder.java | 7 +++++--
.../omega/connector/grpc/LoadBalanceContextBuilderTest.java | 4 ++--
.../grpc/saga/SagaLoadBalanceSenderWithTLSTest.java | 2 +-
.../connector/grpc/saga/SagaLoadBalancedSenderTest.java | 8 ++++++--
.../omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java | 2 +-
.../servicecomb/saga/omega/spring/OmegaSpringConfig.java | 12 ++++++++----
8 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
index 65d231a..2a54f96 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/GrpcOnErrorHandler.java
@@ -33,10 +33,11 @@ public class GrpcOnErrorHandler {
private final GrpcRetryContext grpcRetryContext;
- public GrpcOnErrorHandler(BlockingQueue<Runnable> pendingTasks, Map<MessageSender, Long> senders) {
+ public GrpcOnErrorHandler(BlockingQueue<Runnable> pendingTasks,
+ Map<MessageSender, Long> senders, int timeoutSeconds) {
this.pendingTasks = pendingTasks;
this.senders = senders;
- this.grpcRetryContext = new GrpcRetryContext();
+ this.grpcRetryContext = new GrpcRetryContext(timeoutSeconds);
}
public void handle(MessageSender messageSender) {
@@ -59,13 +60,15 @@ public class GrpcOnErrorHandler {
public static class GrpcRetryContext {
+ private final int timeoutSeconds;
+
private final BlockingQueue<MessageSender> reconnectedSenders = new LinkedBlockingQueue<>();
private final Supplier<MessageSender> defaultMessageSender = new Supplier<MessageSender>() {
@Override
public MessageSender get() {
try {
- MessageSender messageSender = reconnectedSenders.poll(5, TimeUnit.SECONDS);
+ MessageSender messageSender = reconnectedSenders.poll(timeoutSeconds, TimeUnit.SECONDS);
if (null == messageSender) {
throw new OmegaException("Failed to get reconnected sender, all alpha server is down.");
}
@@ -76,6 +79,10 @@ public class GrpcOnErrorHandler {
}
};
+ public GrpcRetryContext(int timeoutSeconds) {
+ this.timeoutSeconds = timeoutSeconds;
+ }
+
public BlockingQueue<MessageSender> getReconnectedSenders() {
return reconnectedSenders;
}
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java
index 2918be8..e2425fc 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContext.java
@@ -33,11 +33,11 @@ public class LoadBalanceContext {
private final GrpcOnErrorHandler grpcOnErrorHandler;
public LoadBalanceContext(Map<MessageSender, Long> senders,
- Collection<ManagedChannel> channels, int reconnectDelay) {
+ Collection<ManagedChannel> channels, int reconnectDelay, int timeoutSeconds) {
this.senders = senders;
this.channels = channels;
this.pendingTaskRunner = new PendingTaskRunner(reconnectDelay);
- this.grpcOnErrorHandler = new GrpcOnErrorHandler(pendingTaskRunner.getPendingTasks(), senders);
+ this.grpcOnErrorHandler = new GrpcOnErrorHandler(pendingTaskRunner.getPendingTasks(), senders, timeoutSeconds);
pendingTaskRunner.start();
}
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java
index 3f3d542..2768135 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/core/LoadBalanceContextBuilder.java
@@ -49,14 +49,17 @@ public class LoadBalanceContextBuilder {
private final int reconnectDelay;
+ private final int timeoutSeconds;
+
private final TransactionType transactionType;
public LoadBalanceContextBuilder(TransactionType transactionType,
- AlphaClusterConfig clusterConfig, ServiceConfig serviceConfig, int reconnectDelay) {
+ AlphaClusterConfig clusterConfig, ServiceConfig serviceConfig, int reconnectDelay, int timeoutSeconds) {
this.transactionType = transactionType;
this.clusterConfig = clusterConfig;
this.serviceConfig = serviceConfig;
this.reconnectDelay = reconnectDelay;
+ this.timeoutSeconds = timeoutSeconds;
}
public LoadBalanceContext build() {
@@ -67,7 +70,7 @@ public class LoadBalanceContextBuilder {
Optional<SslContext> sslContext = buildSslContext(clusterConfig);
Map<MessageSender, Long> senders = new ConcurrentHashMap<>();
Collection<ManagedChannel> channels = new ArrayList<>(clusterConfig.getAddresses().size());
- LoadBalanceContext loadContext = new LoadBalanceContext(senders, channels, reconnectDelay);
+ LoadBalanceContext loadContext = new LoadBalanceContext(senders, channels, reconnectDelay, timeoutSeconds);
for (String address : clusterConfig.getAddresses()) {
ManagedChannel channel = buildChannel(address, sslContext);
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
index 5388777..9d8ef1d 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalanceContextBuilderTest.java
@@ -66,9 +66,9 @@ public class LoadBalanceContextBuilderTest {
when(clusterConfig.getAddresses()).thenReturn(Lists.newArrayList(addresses));
when(clusterConfig.getTccMessageHandler()).thenReturn(tccMessageHandler);
tccLoadBalanceContextBuilder =
- new LoadBalanceContextBuilder(TransactionType.TCC, clusterConfig, serviceConfig, 30);
+ new LoadBalanceContextBuilder(TransactionType.TCC, clusterConfig, serviceConfig, 30, 10);
sagaLoadBalanceContextBuilder =
- new LoadBalanceContextBuilder(TransactionType.SAGA, clusterConfig, serviceConfig, 30);
+ new LoadBalanceContextBuilder(TransactionType.SAGA, clusterConfig, serviceConfig, 30,10);
}
@After
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
index 88e7b84..4b53e83 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalanceSenderWithTLSTest.java
@@ -67,7 +67,7 @@ public class SagaLoadBalanceSenderWithTLSTest extends SagaLoadBalancedSenderTest
LoadBalanceContext loadContext = new LoadBalanceContextBuilder(
TransactionType.SAGA,
clusterConfig,
- new ServiceConfig(serviceName), 100).build();
+ new ServiceConfig(serviceName), 100, 4).build();
return new SagaLoadBalanceSender(loadContext, new FastestSender());
}
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
index 58a49e4..ce6b96e 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/saga/SagaLoadBalancedSenderTest.java
@@ -67,7 +67,7 @@ public class SagaLoadBalancedSenderTest extends SagaLoadBalancedSenderTestBase {
LoadBalanceContext loadContext = new LoadBalanceContextBuilder(
TransactionType.SAGA,
clusterConfig,
- new ServiceConfig(serviceName), 100).build();
+ new ServiceConfig(serviceName), 100, 4).build();
return new SagaLoadBalanceSender(loadContext, new FastestSender());
}
@@ -157,7 +157,11 @@ public class SagaLoadBalancedSenderTest extends SagaLoadBalancedSenderTestBase {
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
- messageSender.send(event);
+ try {
+ messageSender.send(event);
+ } catch (Exception ex) {
+ assertThat(ex.getMessage().endsWith("Failed to get reconnected sender"), is(true));
+ }
}
});
thread.start();
diff --git a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
index f396e0e..569203d 100644
--- a/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
+++ b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/tcc/TccLoadBalanceSenderTest.java
@@ -128,7 +128,7 @@ public class TccLoadBalanceSenderTest extends LoadBalanceSenderTestBase {
when(clusterConfig.isEnableSSL()).thenReturn(false);
loadContext =
- new LoadBalanceContextBuilder(TransactionType.TCC, clusterConfig, serviceConfig, 30).build();
+ new LoadBalanceContextBuilder(TransactionType.TCC, clusterConfig, serviceConfig, 30, 4).build();
tccLoadBalanceSender = new TccLoadBalanceSender(loadContext, new FastestSender());
participatedEvent = new ParticipatedEvent(globalTxId, localTxId, parentTxId, confirmMethod, cancelMethod, TransactionStatus.Succeed);
tccStartedEvent = new TccStartedEvent(globalTxId, localTxId);
diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
index b1fe7e9..02593e1 100644
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
+++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
@@ -108,12 +108,14 @@ class OmegaSpringConfig {
LoadBalanceContext sagaLoadBalanceSenderContext(
AlphaClusterConfig alphaClusterConfig,
ServiceConfig serviceConfig,
- @Value("${omega.connection.reconnectDelay:3000}") int reconnectDelay) {
+ @Value("${omega.connection.reconnectDelay:3000}") int reconnectDelay,
+ @Value("${omega.connection.sending.timeout:8}") int timeoutSeconds) {
LoadBalanceContext loadBalanceSenderContext = new LoadBalanceContextBuilder(
TransactionType.SAGA,
alphaClusterConfig,
serviceConfig,
- reconnectDelay).build();
+ reconnectDelay,
+ timeoutSeconds).build();
return loadBalanceSenderContext;
}
@@ -135,12 +137,14 @@ class OmegaSpringConfig {
LoadBalanceContext loadBalanceSenderContext(
AlphaClusterConfig alphaClusterConfig,
ServiceConfig serviceConfig,
- @Value("${omega.connection.reconnectDelay:3000}") int reconnectDelay) {
+ @Value("${omega.connection.reconnectDelay:3000}") int reconnectDelay,
+ @Value("${omega.connection.sending.timeout:8}") int timeoutSeconds) {
LoadBalanceContext loadBalanceSenderContext = new LoadBalanceContextBuilder(
TransactionType.TCC,
alphaClusterConfig,
serviceConfig,
- reconnectDelay).build();
+ reconnectDelay,
+ timeoutSeconds).build();
return loadBalanceSenderContext;
}