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/07 00:36:04 UTC
[servicecomb-pack] branch master updated (13bb9ef -> f059f96)
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/servicecomb-pack.git.
from 13bb9ef SCB-1282 Support for custom "omegaUniqueIdGenerator" bean.
new 4519913 modify InterruptedException
new f059f96 revert RecoveryPolicyTimeoutWrapper
The 2 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/pack/alpha/benchmark/SagaEventBenchmark.java | 11 ++++++++---
.../fsm/channel/kafka/KafkaChannelAutoConfiguration.java | 5 ++++-
.../pack/alpha/fsm/channel/kafka/KafkaMessagePublisher.java | 3 +++
.../elasticsearch/ElasticsearchTransactionRepository.java | 1 +
.../pack/omega/connector/grpc/core/GrpcOnErrorHandler.java | 1 +
.../omega/connector/grpc/saga/RetryableMessageSender.java | 1 +
6 files changed, 18 insertions(+), 4 deletions(-)
[servicecomb-pack] 01/02: modify InterruptedException
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/servicecomb-pack.git
commit 4519913bc9c49bb1c4f1c7305269d5d4962eafe1
Author: CMonkey <42...@gmail.com>
AuthorDate: Fri Dec 6 16:51:42 2019 +0800
modify InterruptedException
---
.../servicecomb/pack/alpha/benchmark/SagaEventBenchmark.java | 11 ++++++++---
.../fsm/channel/kafka/KafkaChannelAutoConfiguration.java | 5 ++++-
.../pack/alpha/fsm/channel/kafka/KafkaMessagePublisher.java | 3 +++
.../elasticsearch/ElasticsearchTransactionRepository.java | 1 +
.../pack/omega/connector/grpc/core/GrpcOnErrorHandler.java | 1 +
.../omega/connector/grpc/saga/RetryableMessageSender.java | 1 +
.../transaction/wrapper/RecoveryPolicyTimeoutWrapper.java | 1 +
7 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/alpha/alpha-benchmark/src/main/java/org/apache/servicecomb/pack/alpha/benchmark/SagaEventBenchmark.java b/alpha/alpha-benchmark/src/main/java/org/apache/servicecomb/pack/alpha/benchmark/SagaEventBenchmark.java
index ab8f6ad..c36ce04 100644
--- a/alpha/alpha-benchmark/src/main/java/org/apache/servicecomb/pack/alpha/benchmark/SagaEventBenchmark.java
+++ b/alpha/alpha-benchmark/src/main/java/org/apache/servicecomb/pack/alpha/benchmark/SagaEventBenchmark.java
@@ -32,12 +32,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.security.SecureRandom;
@Component
public class SagaEventBenchmark {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private final static SecureRandom SECURERANDOM = new SecureRandom();
+
@Autowired(required = false)
SagaMessageSender sender;
int warmUpConcurrency;
@@ -98,6 +101,7 @@ public class SagaEventBenchmark {
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
LOG.error(e.getMessage(), e);
}
LOG.info("OK");
@@ -118,7 +122,8 @@ public class SagaEventBenchmark {
try {
end.await();
} catch (InterruptedException e) {
- LOG.error("warmUp Exception = [{}]", e.getMessage(), e);
+ Thread.currentThread().interrupt();
+ LOG.error("warmUp Exception = [{}]", e.getMessage(), e);
}
}
@@ -177,6 +182,7 @@ public class SagaEventBenchmark {
}
end.countDown();
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
LOG.error(e.getMessage(), e);
}
}
@@ -213,11 +219,10 @@ public class SagaEventBenchmark {
private String[] generateRandomIdPrefix(int numberOfWords) {
String[] randomStrings = new String[numberOfWords];
- Random random = new Random();
for (int i = 0; i < numberOfWords; i++) {
char[] word = new char[8];
for (int j = 0; j < word.length; j++) {
- word[j] = (char) ('a' + random.nextInt(26));
+ word[j] = (char) ('a' + SECURERANDOM.nextInt(26));
}
randomStrings[i] = new String(word);
}
diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaChannelAutoConfiguration.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaChannelAutoConfiguration.java
index a96621c..a2a32b4 100644
--- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaChannelAutoConfiguration.java
+++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaChannelAutoConfiguration.java
@@ -111,6 +111,9 @@ public class KafkaChannelAutoConfiguration {
.createTopics(Collections.singleton(newTopic));
createTopicsResult.values().get(topic).get();
} catch (InterruptedException | ExecutionException e) {
+ if (e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
if (!(e.getCause() instanceof TopicExistsException)) {
throw new RuntimeException(e.getMessage(), e);
}
@@ -147,4 +150,4 @@ public class KafkaChannelAutoConfiguration {
return new KafkaSagaEventConsumer(actorSystem, sagaShardRegionActor, metricsService,
bootstrap_servers, topic);
}
-}
\ No newline at end of file
+}
diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaMessagePublisher.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaMessagePublisher.java
index fe41fb3..f156bc2 100644
--- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaMessagePublisher.java
+++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/kafka/KafkaMessagePublisher.java
@@ -44,6 +44,9 @@ public class KafkaMessagePublisher implements MessagePublisher<BaseEvent> {
try {
kafkaTemplate.send(topic, data.getGlobalTxId(), data).get();
} catch (InterruptedException | ExecutionException | UnsupportedOperationException e) {
+ if (e.getCause() instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
throw new RuntimeException(e);
}
}
diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
index 4d02443..dffffcf 100644
--- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
+++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java
@@ -268,6 +268,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
try {
Thread.sleep(refreshTime);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
LOG.error(e.getMessage(), e);
}
}
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java
index d2ad6ee..33b049f 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/core/GrpcOnErrorHandler.java
@@ -74,6 +74,7 @@ public class GrpcOnErrorHandler {
}
return messageSender;
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new OmegaException("Failed to get reconnected sender", e);
}
}
diff --git a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java
index 1149778..49c52b1 100644
--- a/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java
+++ b/omega/omega-connector/omega-connector-grpc/src/main/java/org/apache/servicecomb/pack/omega/connector/grpc/saga/RetryableMessageSender.java
@@ -67,6 +67,7 @@ public class RetryableMessageSender implements SagaMessageSender {
try {
return ((SagaMessageSender)availableMessageSenders.take()).send(event);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
throw new OmegaException("Failed to send event " + event + " due to interruption", e);
}
}
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java
index 894d981..9873ac9 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java
@@ -60,6 +60,7 @@ public class RecoveryPolicyTimeoutWrapper {
throw new OmegaException(timeoutProb.getInterruptFailureException());
}
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
if (timeoutProb.getInterruptFailureException() != null) {
throw new OmegaException(timeoutProb.getInterruptFailureException());
}else{
[servicecomb-pack] 02/02: revert RecoveryPolicyTimeoutWrapper
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/servicecomb-pack.git
commit f059f96e24495324f0d441a7dda76fd8b7a1b3af
Author: CMonkey <42...@gmail.com>
AuthorDate: Fri Dec 6 17:26:04 2019 +0800
revert RecoveryPolicyTimeoutWrapper
---
.../pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java
index 9873ac9..894d981 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/wrapper/RecoveryPolicyTimeoutWrapper.java
@@ -60,7 +60,6 @@ public class RecoveryPolicyTimeoutWrapper {
throw new OmegaException(timeoutProb.getInterruptFailureException());
}
} catch (InterruptedException e) {
- Thread.currentThread().interrupt();
if (timeoutProb.getInterruptFailureException() != null) {
throw new OmegaException(timeoutProb.getInterruptFailureException());
}else{