[
https://issues.apache.org/jira/browse/SCB-234?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16326939#comment-16326939
]
ASF GitHub Bot commented on SCB-234:
------------------------------------
seanyinx closed pull request #120: SCB-234 fail fast at SagaStart if all alpha
clusters are down
URL: https://github.com/apache/incubator-servicecomb-saga/pull/120
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
index 700864af..9a78a620 100644
---
a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
+++
b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/LoadBalancedClusterMessageSender.java
@@ -54,6 +54,7 @@
private final BlockingQueue<Runnable> pendingTasks = new
LinkedBlockingQueue<>();
private final BlockingQueue<MessageSender> availableMessageSenders = new
LinkedBlockingQueue<>();
+ private final MessageSender retryableMessageSender = new
RetryableMessageSender(availableMessageSenders);
private final ScheduledExecutorService scheduler =
Executors.newSingleThreadScheduledExecutor();
public LoadBalancedClusterMessageSender(String[] addresses,
@@ -155,13 +156,7 @@ private MessageSender fastestSender() {
.filter(entry -> entry.getValue() < Long.MAX_VALUE)
.min(Comparator.comparingLong(Entry::getValue))
.map(Entry::getKey)
- .orElse(event -> {
- try {
- return availableMessageSenders.take().send(event);
- } catch (InterruptedException e) {
- throw new OmegaException("Failed to send event " + event + " due
to interruption", e);
- }
- });
+ .orElse(retryableMessageSender);
}
private void scheduleReconnectTask(int reconnectDelay) {
diff --git
a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/RetryableMessageSender.java
b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/RetryableMessageSender.java
new file mode 100644
index 00000000..abce82b5
--- /dev/null
+++
b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/saga/omega/connector/grpc/RetryableMessageSender.java
@@ -0,0 +1,47 @@
+/*
+ * 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;
+
+import static org.apache.servicecomb.saga.common.EventType.SagaStartedEvent;
+
+import java.util.concurrent.BlockingQueue;
+
+import org.apache.servicecomb.saga.omega.transaction.AlphaResponse;
+import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.saga.omega.transaction.OmegaException;
+import org.apache.servicecomb.saga.omega.transaction.TxEvent;
+
+public class RetryableMessageSender implements MessageSender {
+ private final BlockingQueue<MessageSender> availableMessageSenders;
+
+ public RetryableMessageSender(BlockingQueue<MessageSender>
availableMessageSenders) {
+ this.availableMessageSenders = availableMessageSenders;
+ }
+
+ @Override
+ public AlphaResponse send(TxEvent event) {
+ if (event.type() == SagaStartedEvent) {
+ throw new OmegaException("Failed to process subsequent requests because
no alpha server is available");
+ }
+ try {
+ return availableMessageSenders.take().send(event);
+ } catch (InterruptedException e) {
+ throw new OmegaException("Failed to send event " + event + " due to
interruption", e);
+ }
+ }
+}
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/LoadBalancedClusterMessageSenderTest.java
index 93cb8544..8062ae90 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/LoadBalancedClusterMessageSenderTest.java
@@ -156,7 +156,7 @@ public void resendToAnotherServerOnFailure() throws
Exception {
assertThat(eventsMap.get(deadPort).size(), is(1));
assertThat(eventsMap.get(deadPort).peek().toString(),
is(event.toString()));
- int livePort = deadPort == 8080? 8090 : 8080;
+ int livePort = deadPort == 8080 ? 8090 : 8080;
assertThat(eventsMap.get(livePort).size(), is(2));
assertThat(eventsMap.get(livePort).peek().toString(),
is(event.toString()));
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/RetryableMessageSenderTest.java
new file mode 100644
index 00000000..562c50f8
--- /dev/null
+++
b/omega/omega-connector/omega-connector-grpc/src/test/java/org/apache/servicecomb/saga/omega/connector/grpc/RetryableMessageSenderTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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;
+
+import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
+import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.apache.servicecomb.saga.omega.transaction.MessageSender;
+import org.apache.servicecomb.saga.omega.transaction.OmegaException;
+import org.apache.servicecomb.saga.omega.transaction.SagaStartedEvent;
+import org.apache.servicecomb.saga.omega.transaction.TxEvent;
+import org.apache.servicecomb.saga.omega.transaction.TxStartedEvent;
+import org.junit.Test;
+
+public class RetryableMessageSenderTest {
+ @SuppressWarnings("unchecked")
+ private final BlockingQueue<MessageSender> availableMessageSenders = new
LinkedBlockingQueue<>();
+ private final MessageSender messageSender = new
RetryableMessageSender(availableMessageSenders);
+
+ private final String globalTxId = uniquify("globalTxId");
+ private final String localTxId = uniquify("localTxId");
+ private final TxStartedEvent event = new TxStartedEvent(globalTxId,
localTxId, null, "method x");
+
+ @Test
+ public void sendEventWhenSenderIsAvailable() {
+ MessageSender sender = mock(MessageSender.class);
+ availableMessageSenders.add(sender);
+
+ messageSender.send(event);
+
+ verify(sender, times(1)).send(event);
+ }
+
+ @Test
+ public void blowsUpWhenEventIsSagaStarted() {
+ TxEvent event = new SagaStartedEvent(globalTxId, localTxId);
+
+ try {
+ messageSender.send(event);
+ expectFailing(OmegaException.class);
+ } catch (OmegaException e) {
+ assertThat(e.getMessage(),
+ is("Failed to process subsequent requests because no alpha server is
available"));
+ }
+ }
+
+ @Test
+ public void blowsUpWhenInterrupted() throws InterruptedException {
+ Thread thread = new Thread(() -> {
+ try {
+ messageSender.send(event);
+ expectFailing(OmegaException.class);
+ } catch (OmegaException e) {
+ assertThat(e.getMessage().endsWith("interruption"), is(true));
+ }
+ });
+
+ thread.start();
+ thread.interrupt();
+ thread.join();
+ }
+}
\ No newline at end of file
diff --git a/omega/omega-transaction/pom.xml b/omega/omega-transaction/pom.xml
index a2bf2932..258770c9 100644
--- a/omega/omega-transaction/pom.xml
+++ b/omega/omega-transaction/pom.xml
@@ -46,6 +46,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java
index 7299b255..7ef021a2 100644
---
a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java
+++
b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessor.java
@@ -17,6 +17,8 @@
package org.apache.servicecomb.saga.omega.transaction;
+import javax.transaction.TransactionalException;
+
import org.apache.servicecomb.saga.omega.context.OmegaContext;
class SagaStartAnnotationProcessor implements EventAwareInterceptor {
@@ -31,7 +33,11 @@
@Override
public AlphaResponse preIntercept(String parentTxId, String
compensationMethod, Object... message) {
- return sender.send(new SagaStartedEvent(omegaContext.globalTxId(),
omegaContext.localTxId()));
+ try {
+ return sender.send(new SagaStartedEvent(omegaContext.globalTxId(),
omegaContext.localTxId()));
+ } catch (OmegaException e) {
+ throw new TransactionalException(e.getMessage(), e.getCause());
+ }
}
@Override
diff --git
a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
index f8e936da..566a456b 100644
---
a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
+++
b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/SagaStartAnnotationProcessorTest.java
@@ -17,15 +17,21 @@
package org.apache.servicecomb.saga.omega.transaction;
+import static com.seanyinx.github.unit.scaffolding.AssertUtils.expectFailing;
+import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNull.nullValue;
import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import javax.transaction.TransactionalException;
+
import org.apache.servicecomb.saga.common.EventType;
import org.apache.servicecomb.saga.omega.context.IdGenerator;
import org.apache.servicecomb.saga.omega.context.OmegaContext;
@@ -43,12 +49,10 @@
private final String globalTxId = UUID.randomUUID().toString();
- private final String localTxId = UUID.randomUUID().toString();
-
@SuppressWarnings("unchecked")
private final IdGenerator<String> generator = mock(IdGenerator.class);
-
private final OmegaContext context = new OmegaContext(generator);
+ private final OmegaException exception = new OmegaException("exception", new
RuntimeException("runtime exception"));
private final SagaStartAnnotationProcessor sagaStartAnnotationProcessor =
new SagaStartAnnotationProcessor(context,
sender);
@@ -86,4 +90,21 @@ public void sendsSagaEndedEvent() {
assertThat(event.type(), is(EventType.SagaEndedEvent));
assertThat(event.payloads().length, is(0));
}
+
+ @Test
+ public void transformInterceptedException() {
+ MessageSender sender = mock(MessageSender.class);
+ SagaStartAnnotationProcessor sagaStartAnnotationProcessor = new
SagaStartAnnotationProcessor(context, sender);
+
+ doThrow(exception).when(sender).send(any());
+
+ try {
+ sagaStartAnnotationProcessor.preIntercept(null, null);
+ expectFailing(TransactionalException.class);
+ } catch (TransactionalException e) {
+ assertThat(e.getMessage(), is("exception"));
+ assertThat(e.getCause(), instanceOf(RuntimeException.class));
+ assertThat(e.getCause().getMessage(), is("runtime exception"));
+ }
+ }
}
diff --git a/pom.xml b/pom.xml
index 1d41a456..9338b2f1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
<maven.failsafe.version>2.19.1</maven.failsafe.version>
<grpc.version>1.8.0</grpc.version>
<kryo.version>4.0.1</kryo.version>
+ <javax.transaction.version>1.2</javax.transaction.version>
</properties>
<name>ServiceComb Saga</name>
@@ -347,6 +348,11 @@
<artifactId>kryo</artifactId>
<version>${kryo.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>javax.transaction-api</artifactId>
+ <version>${javax.transaction.version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> [pack] fail fast if alpha cluster down
> --------------------------------------
>
> Key: SCB-234
> URL: https://issues.apache.org/jira/browse/SCB-234
> Project: Apache ServiceComb
> Issue Type: Improvement
> Components: Saga
> Reporter: Yin Xiang
> Assignee: Eric Lee
> Priority: Major
> Fix For: saga-0.1.0
>
>
> when alpha cluster is down, future transactions should fail immediately at
> @SagaStart instead of keep retrying, in order not to stress the services
> further by blocking all the request threads.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
