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/08/15 15:57:42 UTC
[servicecomb-pack] branch master updated (c418ef6 -> 26d8942)
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 c418ef6 SCB-1439 Modify batchSize default value is 1000
new c8157df SCB-1438 Change attribute lock to static
new 26d8942 SCB-1438 Fix queries concurrent access error
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:
.../elasticsearch/ElasticsearchTransactionRepository.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
[servicecomb-pack] 02/02: SCB-1438 Fix queries concurrent access
error
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 26d89422521cd85f191ae4fda7aa1adb639a6edf
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Thu Aug 15 22:25:49 2019 +0800
SCB-1438 Fix queries concurrent access error
---
.../elasticsearch/ElasticsearchTransactionRepository.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
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 8d49757..15c9cbd 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
@@ -70,7 +70,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
private int batchSizeCounter;
private int refreshTime;
private final List<IndexQuery> queries = new ArrayList<>();
- private final static Boolean lock = true;
+ private final Boolean lock = true;
public ElasticsearchTransactionRepository(
ElasticsearchTemplate template, MetricsService metricsService, int batchSize,
@@ -89,12 +89,12 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
@Override
public void send(GlobalTransaction transaction) throws Exception {
- long begin = System.currentTimeMillis();
- queries.add(convert(transaction));
- batchSizeCounter++;
- metricsService.metrics().doRepositoryReceived();
- if (batchSize == 0 || batchSizeCounter == batchSize) {
- synchronized (lock) {
+ synchronized (lock) {
+ long begin = System.currentTimeMillis();
+ queries.add(convert(transaction));
+ batchSizeCounter++;
+ metricsService.metrics().doRepositoryReceived();
+ if (batchSize == 0 || batchSizeCounter == batchSize) {
save(begin);
batchSizeCounter = 0;
}
[servicecomb-pack] 01/02: SCB-1438 Change attribute lock to static
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 c8157df3d23996c5d2d2c66c0ace095700b4933d
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Thu Aug 15 17:08:28 2019 +0800
SCB-1438 Change attribute lock to static
---
.../repository/elasticsearch/ElasticsearchTransactionRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 f7aed5b..8d49757 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
@@ -70,7 +70,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
private int batchSizeCounter;
private int refreshTime;
private final List<IndexQuery> queries = new ArrayList<>();
- private final Boolean lock = true;
+ private final static Boolean lock = true;
public ElasticsearchTransactionRepository(
ElasticsearchTemplate template, MetricsService metricsService, int batchSize,