You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by se...@apache.org on 2018/01/16 00:56:03 UTC
[incubator-servicecomb-saga] 06/06: SCB-227 minor fix
This is an automated email from the ASF dual-hosted git repository.
seanyinx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 9643ad8779be73d345842a5f6b6d1f6953714625
Author: Eric Lee <da...@huawei.com>
AuthorDate: Mon Jan 15 22:37:18 2018 +0800
SCB-227 minor fix
Signed-off-by: Eric Lee <da...@huawei.com>
---
.../omega/connector/grpc/LoadBalancedClusterMessageSender.java | 7 ++++---
.../omega/connector/grpc/LoadBalancedClusterMessageSenderTest.java | 4 +++-
.../servicecomb/saga/omega/transaction/TransactionAspect.java | 4 ++--
.../servicecomb/saga/omega/transaction/TransactionAspectTest.java | 3 ++-
4 files changed, 11 insertions(+), 7 deletions(-)
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 b5e461b..700864a 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
@@ -136,6 +136,8 @@ public class LoadBalancedClusterMessageSender implements MessageSender {
senders.put(messageSender, System.nanoTime() - startTime);
return response;
+ } catch (OmegaException e) {
+ throw e;
} catch (Exception e) {
log.error("Retry sending event {} due to failure", event, e);
@@ -156,10 +158,9 @@ public class LoadBalancedClusterMessageSender implements MessageSender {
.orElse(event -> {
try {
return availableMessageSenders.take().send(event);
- } catch (InterruptedException ignored) {
- Thread.currentThread().interrupt();
+ } catch (InterruptedException e) {
+ throw new OmegaException("Failed to send event " + event + " due to interruption", e);
}
- throw new OmegaException("Failed to send event " + event + " due to interruption");
});
}
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 b62dbfc..93cb854 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
@@ -304,7 +304,7 @@ public class LoadBalancedClusterMessageSenderTest {
}
@Test
- public void blowsUpWhenServerIsInterrupted() {
+ public void blowsUpWhenServerIsInterrupted() throws InterruptedException {
Thread thread = new Thread(() -> {
try {
messageSender.send(event);
@@ -313,8 +313,10 @@ public class LoadBalancedClusterMessageSenderTest {
assertThat(e.getMessage().endsWith("interruption"), is(true));
}
});
+
thread.start();
thread.interrupt();
+ thread.join();
}
private int killServerReceivedMessage() {
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java
index 73a0372..cead07a 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspect.java
@@ -63,8 +63,8 @@ public class TransactionAspect {
if (response.aborted()) {
String abortedLocalTxId = context.localTxId();
context.setLocalTxId(localTxId);
- throw new InvalidTransactionException("Abort local sub transaction " + abortedLocalTxId +
- " due to global transaction " + context.globalTxId() + " has already aborted.");
+ throw new InvalidTransactionException("Abort sub transaction " + abortedLocalTxId +
+ " because global transaction " + context.globalTxId() + " has already aborted.");
}
LOG.debug("Updated context {} for compensable method {} ", context, method.toString());
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
index ec08134..a3db940 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/TransactionAspectTest.java
@@ -178,7 +178,8 @@ public class TransactionAspectTest {
aspect.advise(joinPoint, compensable);
expectFailing(InvalidTransactionException.class);
} catch (InvalidTransactionException e) {
- assertThat(e.getMessage().contains("Abort local sub transaction"), is(true));
+ System.out.println(e.getMessage());
+ assertThat(e.getMessage().contains("Abort sub transaction"), is(true));
}
verify(sender, times(1)).send(any());
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.