[GitHub] [servicecomb-toolkit] kakulisen commented on issue #17: SCB-1436 Model is not generated, but the related package is imported
kakulisen commented on issue #17: SCB-1436 Model is not generated, but the related package is imported URL: https://github.com/apache/servicecomb-toolkit/pull/17#issuecomment-521552212 Yes, I can. I have submitted a new commit for it. pls help to check, thanks This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-toolkit] MabinGo merged pull request #17: SCB-1436 Model is not generated, but the related package is imported
MabinGo merged pull request #17: SCB-1436 Model is not generated, but the related package is imported URL: https://github.com/apache/servicecomb-toolkit/pull/17 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-kie] liuqi04 opened a new pull request #26: remove project and domain from res, set content-type to json
liuqi04 opened a new pull request #26: remove project and domain from res, set content-type to json URL: https://github.com/apache/servicecomb-kie/pull/26 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] coveralls commented on issue #537: [SCB-1439]Optimize class ElasticsearchTransactionRepository persistence parameters
coveralls commented on issue #537: [SCB-1439]Optimize class ElasticsearchTransactionRepository persistence parameters URL: https://github.com/apache/servicecomb-pack/pull/537#issuecomment-521602623 [](https://coveralls.io/builds/25151372) Coverage increased (+0.02%) to 82.909% when pulling **5a9b563121a41a27ee9bec0155379e44229578b9 on coolbeevip:SCB-1439** into **7b3eb4671aa440cc261e365075ae885660c1cc3a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] AngLi2 opened a new pull request #1297: [SCB-1437] upgrading third party dependency versions
AngLi2 opened a new pull request #1297: [SCB-1437] upgrading third party dependency versions URL: https://github.com/apache/servicecomb-java-chassis/pull/1297 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install -Pit` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] coveralls commented on issue #536: [SCB-1438] Modify attribute lock to static
coveralls commented on issue #536: [SCB-1438] Modify attribute lock to static URL: https://github.com/apache/servicecomb-pack/pull/536#issuecomment-521604796 [](https://coveralls.io/builds/25151511) Coverage remained the same at 82.886% when pulling **fff0b738694be66d9ec8a44ed7f4550c07bd1692 on coolbeevip:SCB-1438** into **7b3eb4671aa440cc261e365075ae885660c1cc3a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-java-chassis] coveralls commented on issue #1297: [SCB-1437] upgrading third party dependency versions
coveralls commented on issue #1297: [SCB-1437] upgrading third party dependency versions URL: https://github.com/apache/servicecomb-java-chassis/pull/1297#issuecomment-521566493 [](https://coveralls.io/builds/25149855) Coverage increased (+0.009%) to 85.758% when pulling **8f57266b75e7a07551588241a7b650be60f043b3 on AngLi2:Upgrading** into **55b0f165b58a70868a2e69083b1d30a3b8f82838 on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] coolbeevip opened a new pull request #537: [SCB-1439]Optimize class ElasticsearchTransactionRepository persistence parameters
coolbeevip opened a new pull request #537: [SCB-1439]Optimize class ElasticsearchTransactionRepository persistence parameters URL: https://github.com/apache/servicecomb-pack/pull/537 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). --- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] coolbeevip opened a new pull request #536: [SCB-1438] Modify attribute lock to static
coolbeevip opened a new pull request #536: [SCB-1438] Modify attribute lock to static URL: https://github.com/apache/servicecomb-pack/pull/536 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] coveralls commented on issue #538: SCB-1440 Removed the dependencies of Kamon
coveralls commented on issue #538: SCB-1440 Removed the dependencies of Kamon URL: https://github.com/apache/servicecomb-pack/pull/538#issuecomment-521602208 [](https://coveralls.io/builds/25151363) Coverage increased (+0.06%) to 82.948% when pulling **960cec45188ae6c354558d0dc66ea70770f0e01c on SCB-1440** into **7b3eb4671aa440cc261e365075ae885660c1cc3a on master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch SCB-1440 created (now 960cec4)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1440 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. at 960cec4 SCB-1440 Removed the dependencies of Kamon This branch includes the following new commits: new 960cec4 SCB-1440 Removed the dependencies of Kamon The 1 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.
[GitHub] [servicecomb-pack] WillemJiang opened a new pull request #538: SCB-1440 Removed the dependencies of Kamon
WillemJiang opened a new pull request #538: SCB-1440 Removed the dependencies of Kamon URL: https://github.com/apache/servicecomb-pack/pull/538 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] 01/01: SCB-1440 Removed the dependencies of Kamon
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch SCB-1440
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit 960cec45188ae6c354558d0dc66ea70770f0e01c
Author: Willem Jiang
AuthorDate: Thu Aug 15 17:30:43 2019 +0800
SCB-1440 Removed the dependencies of Kamon
---
alpha/alpha-core/pom.xml | 5 --
.../servicecomb/pack/alpha/core/EventScanner.java | 13 +---
.../pack/alpha/core/TxConsistentService.java | 5 --
alpha/alpha-server/pom.xml | 61 +-
.../pack/alpha/server/AlphaApplication.java| 4 +-
.../pack/alpha/server/AlphaEventController.java| 7 --
.../pack/alpha/server/GrpcTxEventEndpointImpl.java | 6 --
.../pack/alpha/server/SpringCommandRepository.java | 7 --
.../pack/alpha/server/SpringTxEventRepository.java | 11
.../alpha/server/SpringTxTimeoutRepository.java| 7 --
.../provider/jdbc/SpringMasterLockRepository.java | 7 --
.../console/saga/SagaTransactionsController.java | 10 +--
.../alpha/server/fsm/FsmSagaDataController.java| 5 --
.../alpha/server/fsm/GrpcSagaEventService.java | 4 --
.../alpha/server/tcc/AlphaTccEventController.java | 3 -
distribution/src/release/LICENSE | 4 --
pom.xml| 75 --
17 files changed, 4 insertions(+), 230 deletions(-)
diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml
index ec1829d..79a751e 100644
--- a/alpha/alpha-core/pom.xml
+++ b/alpha/alpha-core/pom.xml
@@ -42,11 +42,6 @@
javax.persistence
javax.persistence-api
-
-
- io.kamon
- kamon-annotation_2.12
-
org.apache.logging.log4j
log4j-slf4j-impl
diff --git
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
index 2dd7af6..7c63ef0 100644
---
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
+++
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
@@ -27,13 +27,9 @@ import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Trace;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@EnableKamon
public class EventScanner implements Runnable {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -102,7 +98,6 @@ public class EventScanner implements Runnable {
MILLISECONDS);
}
- @Trace("findTimeoutEvents")
private void findTimeoutEvents() {
eventRepository.findTimeoutEvents()
.forEach(event -> {
@@ -115,7 +110,6 @@ public class EventScanner implements Runnable {
timeoutRepository.markTimeoutAsDone();
}
- @Trace("saveUncompensatedEventsToCommands")
private void saveUncompensatedEventsToCommands() {
eventRepository.findFirstUncompensatedEventByIdGreaterThan(nextEndedEventId,
TxEndedEvent.name())
.forEach(event -> {
@@ -125,7 +119,6 @@ public class EventScanner implements Runnable {
});
}
- @Trace("updateCompensationStatus")
private void updateCompensatedCommands() {
eventRepository.findFirstCompensatedEventByIdGreaterThan(nextCompensatedEventId)
.ifPresent(event -> {
@@ -135,7 +128,6 @@ public class EventScanner implements Runnable {
});
}
- @Trace("deleteDuplicateSagaEndedEvents")
private void deleteDuplicateSagaEndedEvents() {
try {
eventRepository.deleteDuplicateEvents(SagaEndedEvent.name());
@@ -153,7 +145,6 @@ public class EventScanner implements Runnable {
markSagaEnded(event);
}
- @Trace("abortTimeoutEvents")
private void abortTimeoutEvents() {
timeoutRepository.findFirstTimeout().forEach(timeout -> {
LOG.info("Found timeout event {} to abort", timeout);
@@ -167,7 +158,6 @@ public class EventScanner implements Runnable {
});
}
- @Trace("updateTransactionStatus")
private void updateTransactionStatus() {
eventRepository.findFirstAbortedGlobalTransaction().ifPresent(this::markGlobalTxEndWithEvents);
}
@@ -210,8 +200,7 @@ public class EventScanner implements Runnable {
"",
EMPTY_PAYLOAD);
}
-
- @Trace("compensate")
+
private void compensate() {
commandRepository.findFirstCommandToCompensate()
.forEach(command -> {
diff --git
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.java
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.java
index 52357ec..ac7d255 100644
---
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.java
+++
[GitHub] [servicecomb-pack] WillemJiang merged pull request #537: [SCB-1439]Optimize class ElasticsearchTransactionRepository persistence parameters
WillemJiang merged pull request #537: [SCB-1439]Optimize class ElasticsearchTransactionRepository persistence parameters URL: https://github.com/apache/servicecomb-pack/pull/537 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch master updated: SCB-1439 Modify batchSize default value is 1000
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
The following commit(s) were added to refs/heads/master by this push:
new c418ef6 SCB-1439 Modify batchSize default value is 1000
c418ef6 is described below
commit c418ef6be31eca00b8a750be98b0855e718402b1
Author: Lei Zhang
AuthorDate: Thu Aug 15 17:12:30 2019 +0800
SCB-1439 Modify batchSize default value is 1000
---
.../org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
index 17ece87..4d861f6 100644
---
a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
+++
b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/FsmAutoConfiguration.java
@@ -58,7 +58,7 @@ public class FsmAutoConfiguration {
@Value("${alpha.feature.akka.channel.memory.size:-1}")
int memoryEventChannelMemorySize;
-
@Value("${alpha.feature.akka.transaction.repository.elasticsearch.batchSize:100}")
+
@Value("${alpha.feature.akka.transaction.repository.elasticsearch.batchSize:1000}")
int repositoryElasticsearchBatchSize;
@Value("${alpha.feature.akka.transaction.repository.elasticsearch.refreshTime:5000}")
[GitHub] [servicecomb-pack] coveralls edited a comment on issue #536: [SCB-1438] Fix queue concurrent access error
coveralls edited a comment on issue #536: [SCB-1438] Fix queue concurrent access error URL: https://github.com/apache/servicecomb-pack/pull/536#issuecomment-521604796 [](https://coveralls.io/builds/25156263) Coverage increased (+0.09%) to 82.979% when pulling **a488a497aec6a8bab072571ced6324021976d0cf on coolbeevip:SCB-1438** into **7b3eb4671aa440cc261e365075ae885660c1cc3a on apache:master**. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch master updated: SCB-1440 Removed the dependencies of Kamon
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
The following commit(s) were added to refs/heads/master by this push:
new 6eff0d6 SCB-1440 Removed the dependencies of Kamon
6eff0d6 is described below
commit 6eff0d6b8b84b5a3c0c33c91756488d54b302dab
Author: Willem Jiang
AuthorDate: Thu Aug 15 17:30:43 2019 +0800
SCB-1440 Removed the dependencies of Kamon
---
alpha/alpha-core/pom.xml | 5 --
.../servicecomb/pack/alpha/core/EventScanner.java | 13 +---
.../pack/alpha/core/TxConsistentService.java | 5 --
alpha/alpha-server/pom.xml | 61 +-
.../pack/alpha/server/AlphaApplication.java| 4 +-
.../pack/alpha/server/AlphaEventController.java| 7 --
.../pack/alpha/server/GrpcTxEventEndpointImpl.java | 6 --
.../pack/alpha/server/SpringCommandRepository.java | 7 --
.../pack/alpha/server/SpringTxEventRepository.java | 11
.../alpha/server/SpringTxTimeoutRepository.java| 7 --
.../provider/jdbc/SpringMasterLockRepository.java | 7 --
.../console/saga/SagaTransactionsController.java | 10 +--
.../alpha/server/fsm/FsmSagaDataController.java| 5 --
.../alpha/server/fsm/GrpcSagaEventService.java | 4 --
.../alpha/server/tcc/AlphaTccEventController.java | 3 -
distribution/src/release/LICENSE | 4 --
pom.xml| 75 --
17 files changed, 4 insertions(+), 230 deletions(-)
diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml
index ec1829d..79a751e 100644
--- a/alpha/alpha-core/pom.xml
+++ b/alpha/alpha-core/pom.xml
@@ -42,11 +42,6 @@
javax.persistence
javax.persistence-api
-
-
- io.kamon
- kamon-annotation_2.12
-
org.apache.logging.log4j
log4j-slf4j-impl
diff --git
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
index 2dd7af6..7c63ef0 100644
---
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
+++
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/EventScanner.java
@@ -27,13 +27,9 @@ import java.lang.invoke.MethodHandles;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
-import kamon.annotation.EnableKamon;
-import kamon.annotation.Trace;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@EnableKamon
public class EventScanner implements Runnable {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -102,7 +98,6 @@ public class EventScanner implements Runnable {
MILLISECONDS);
}
- @Trace("findTimeoutEvents")
private void findTimeoutEvents() {
eventRepository.findTimeoutEvents()
.forEach(event -> {
@@ -115,7 +110,6 @@ public class EventScanner implements Runnable {
timeoutRepository.markTimeoutAsDone();
}
- @Trace("saveUncompensatedEventsToCommands")
private void saveUncompensatedEventsToCommands() {
eventRepository.findFirstUncompensatedEventByIdGreaterThan(nextEndedEventId,
TxEndedEvent.name())
.forEach(event -> {
@@ -125,7 +119,6 @@ public class EventScanner implements Runnable {
});
}
- @Trace("updateCompensationStatus")
private void updateCompensatedCommands() {
eventRepository.findFirstCompensatedEventByIdGreaterThan(nextCompensatedEventId)
.ifPresent(event -> {
@@ -135,7 +128,6 @@ public class EventScanner implements Runnable {
});
}
- @Trace("deleteDuplicateSagaEndedEvents")
private void deleteDuplicateSagaEndedEvents() {
try {
eventRepository.deleteDuplicateEvents(SagaEndedEvent.name());
@@ -153,7 +145,6 @@ public class EventScanner implements Runnable {
markSagaEnded(event);
}
- @Trace("abortTimeoutEvents")
private void abortTimeoutEvents() {
timeoutRepository.findFirstTimeout().forEach(timeout -> {
LOG.info("Found timeout event {} to abort", timeout);
@@ -167,7 +158,6 @@ public class EventScanner implements Runnable {
});
}
- @Trace("updateTransactionStatus")
private void updateTransactionStatus() {
eventRepository.findFirstAbortedGlobalTransaction().ifPresent(this::markGlobalTxEndWithEvents);
}
@@ -210,8 +200,7 @@ public class EventScanner implements Runnable {
"",
EMPTY_PAYLOAD);
}
-
- @Trace("compensate")
+
private void compensate() {
commandRepository.findFirstCommandToCompensate()
.forEach(command -> {
diff --git
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/TxConsistentService.java
[GitHub] [servicecomb-pack] coolbeevip opened a new pull request #539: [SCB-1443] Adding a Rolling File Appender for Log4j2
coolbeevip opened a new pull request #539: [SCB-1443] Adding a Rolling File Appender for Log4j2 URL: https://github.com/apache/servicecomb-pack/pull/539 Output log files to log/alpha-server.log This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] WillemJiang merged pull request #538: SCB-1440 Removed the dependencies of Kamon
WillemJiang merged pull request #538: SCB-1440 Removed the dependencies of Kamon URL: https://github.com/apache/servicecomb-pack/pull/538 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] [servicecomb-pack] WillemJiang merged pull request #536: [SCB-1438] Fix queue concurrent access error
WillemJiang merged pull request #536: [SCB-1438] Fix queue concurrent access error URL: https://github.com/apache/servicecomb-pack/pull/536 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] 02/02: SCB-1438 Fix queries concurrent access error
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
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 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] 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] 01/02: SCB-1438 Change attribute lock to static
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 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 queries = new ArrayList<>(); - private final Boolean lock = true; + private final static Boolean lock = true; public ElasticsearchTransactionRepository( ElasticsearchTemplate template, MetricsService metricsService, int batchSize,
[servicecomb-pack] branch SCB-1430 deleted (was 04e78b4)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1430 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was 04e78b4 SCB-1430 Updated the License file for ServiceComb Pack release The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[servicecomb-pack] branch SCB-1440 deleted (was 960cec4)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch SCB-1440 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git. was 960cec4 SCB-1440 Removed the dependencies of Kamon The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [servicecomb-pack] WillemJiang merged pull request #539: [SCB-1443] Adding a Rolling File Appender for Log4j2
WillemJiang merged pull request #539: [SCB-1443] Adding a Rolling File Appender for Log4j2 URL: https://github.com/apache/servicecomb-pack/pull/539 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[servicecomb-pack] branch master updated: SCB-1443 Adding a Rolling File Appender for Log4j2
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
The following commit(s) were added to refs/heads/master by this push:
new 9b66b8c SCB-1443 Adding a Rolling File Appender for Log4j2
9b66b8c is described below
commit 9b66b8cb0b29ad195b4f9a6be38a92dfbf392d0b
Author: Lei Zhang
AuthorDate: Fri Aug 16 01:03:20 2019 +0800
SCB-1443 Adding a Rolling File Appender for Log4j2
---
alpha/alpha-server/src/main/resources/log4j2.xml | 32
1 file changed, 27 insertions(+), 5 deletions(-)
diff --git a/alpha/alpha-server/src/main/resources/log4j2.xml
b/alpha/alpha-server/src/main/resources/log4j2.xml
index cae04cb..96a4f32 100644
--- a/alpha/alpha-server/src/main/resources/log4j2.xml
+++ b/alpha/alpha-server/src/main/resources/log4j2.xml
@@ -16,15 +16,37 @@
~ limitations under the License.
-->
-
+
+
+
+ %d{-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} :
%m%n%ex
+
+
-
+
+${LOG_PATTERN}
+
+
+
+${LOG_PATTERN}
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
[servicecomb-kie] branch master updated: remove project and domain from res, set content-type to json (#26)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-kie.git
The following commit(s) were added to refs/heads/master by this push:
new a242349 remove project and domain from res, set content-type to json
(#26)
a242349 is described below
commit a242349b7a263ff7194f5ee02b451e523d3822e4
Author: Qi Liu <30484670+liuq...@users.noreply.github.com>
AuthorDate: Fri Aug 16 11:05:31 2019 +0800
remove project and domain from res, set content-type to json (#26)
---
client/client_test.go | 8 ++--
server/resource/v1/kv_resource.go | 6 --
server/service/history/dao.go | 1 +
server/service/history/tool.go| 31 +++
server/service/kv/service.go | 3 +++
server/service/kv/tool.go | 2 ++
6 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/client/client_test.go b/client/client_test.go
index 8883a32..d92ca14 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -90,7 +90,8 @@ var _ = Describe("Client", func() {
Expect(res.Key).Should(Equal(kv.Key))
Expect(res.Labels).Should(Equal(kv.Labels))
Expect(res.Value).Should(Equal(kv.Value))
- Expect(res.Project).Should(Equal("test"))
+ Expect(res.Project).Should(Equal(""))
+ Expect(res.Domain).Should(Equal(""))
})
kvs, _ := c1.Get(context.TODO(), "app.properties",
WithGetProject("test"))
It("should exactly 1 kv", func() {
@@ -116,7 +117,10 @@ var _ = Describe("Client", func() {
It("should not be error", func() {
Ω(err).ShouldNot(HaveOccurred())
Expect(kv.Key).To(Equal(kvBody.Key))
- Expect(kv.Project).To(Equal(kvBody.Project))
+ Expect(kv.Value).To(Equal(kvBody.Value))
+ Expect(kv.Labels).To(Equal(kvBody.Labels))
+ Expect(kv.Project).To(Equal(""))
+ Expect(kv.Domain).To(Equal(""))
})
kvs, err := client2.Get(context.TODO(), "time",
WithGetProject("test"))
It("should return exactly 1 kv", func() {
diff --git a/server/resource/v1/kv_resource.go
b/server/resource/v1/kv_resource.go
index deba25a..eebd1f5 100644
--- a/server/resource/v1/kv_resource.go
+++ b/server/resource/v1/kv_resource.go
@@ -62,8 +62,10 @@ func (r *KVResource) Put(context *restful.Context) {
return
}
InfoLog("put", kv)
- context.WriteHeader(http.StatusOK)
- context.WriteHeaderAndJSON(http.StatusOK, kv, goRestful.MIME_JSON)
+ err = context.WriteHeaderAndJSON(http.StatusOK, kv, goRestful.MIME_JSON)
+ if err != nil {
+ openlogging.Error(err.Error())
+ }
}
diff --git a/server/service/history/dao.go b/server/service/history/dao.go
index a373970..476b361 100644
--- a/server/service/history/dao.go
+++ b/server/service/history/dao.go
@@ -88,6 +88,7 @@ func getHistoryByLabelID(ctx context.Context, filter bson.M)
([]*model.LabelRevi
return nil, err
}
exist = true
+ clearRevisionKV()
rvs = append(rvs, )
}
if !exist {
diff --git a/server/service/history/tool.go b/server/service/history/tool.go
new file mode 100644
index 000..f72013d
--- /dev/null
+++ b/server/service/history/tool.go
@@ -0,0 +1,31 @@
+/*
+ * 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 history
+
+import (
+ "github.com/apache/servicecomb-kie/pkg/model"
+)
+
+//clearRevisionKV clean attr which don't need to return to client side
+func clearRevisionKV(revision *model.LabelRevisionDoc) {
+ for _, v := range revision.KVs {
+ v.Domain = ""
+ v.Project = ""
+ v.LabelID = ""
+
[GitHub] [servicecomb-kie] tianxiaoliang merged pull request #26: remove project and domain from res, set content-type to json
tianxiaoliang merged pull request #26: remove project and domain from res, set content-type to json URL: https://github.com/apache/servicecomb-kie/pull/26 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
