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/10/04 01:58:58 UTC
[servicecomb-pack] branch master updated: [SCB-1502] Code Cleanup
(#566)
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 19386f2 [SCB-1502] Code Cleanup (#566)
19386f2 is described below
commit 19386f2ad097c606e36cfe3a422952b69a57944b
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Fri Oct 4 09:58:53 2019 +0800
[SCB-1502] Code Cleanup (#566)
* SCB-1439 Modify batchSize default value is 1000
* SCB-1502 Code Cleanup
---
.../pack/alpha/core/fsm/repository/model/GlobalTransaction.java | 2 +-
.../elasticsearch/ElasticsearchTransactionRepository.java | 4 ++--
.../pack/alpha/server/console/saga/SagaTransactionsController.java | 6 ++++--
.../pack/alpha/server/tcc/callback/TccCallbackEngine.java | 2 +-
.../servicecomb/pack/alpha/ui/controller/IndexController.java | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java
index 01d8956..daee78c 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java
@@ -184,7 +184,7 @@ public class GlobalTransaction {
try {
globalTransaction.events.add(event.toMap());
} catch (Exception e) {
- new RuntimeException(e.getMessage(),e);
+ throw new RuntimeException(e.getMessage(),e);
}
}
return globalTransaction;
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 47655e3..4d02443 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 Object lock = new Object();
public ElasticsearchTransactionRepository(
ElasticsearchTemplate template, MetricsService metricsService, int batchSize,
@@ -215,7 +215,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
globalTransactionDocument = mapper.readValue(hit.getSourceAsString(),
GlobalTransactionDocument.class);
} catch (IOException e) {
- new RuntimeException(e.getMessage(), e);
+ throw new RuntimeException(e.getMessage(), e);
}
result.add(globalTransactionDocument);
}
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
index 2a04542..c603220 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/console/saga/SagaTransactionsController.java
@@ -226,14 +226,16 @@ public class SagaTransactionsController {
Iterable<TxEvent> events;
if (globalTxID != null) {
events = eventRepository.findByGlobalTxId(globalTxID.toString());
- } else if (microServiceName != "") {
+ } else if (!"".equals(microServiceName)) {
events = eventRepository.findByServiceName(microServiceName);
} else {
events = null;
}
Collection<TxEventVo> eventVos = new LinkedList<>();
- events.forEach(event -> eventVos.add(new SagaTransactionsController.TxEventVo(event)));
+ if (events != null) {
+ events.forEach(event -> eventVos.add(new SagaTransactionsController.TxEventVo(event)));
+ }
return ResponseEntity.ok(eventVos);
}
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java
index ea65b74..5bf3362 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/tcc/callback/TccCallbackEngine.java
@@ -61,7 +61,7 @@ public class TccCallbackEngine implements CallbackEngine {
"Failed to invoke service [{}] instance [{}] with method [{}], global tx id [{}] and local tx id [{}]",
event.getServiceName(),
event.getInstanceId(),
- TransactionStatus.Succeed.equals(event.getStatus()) ? event.getConfirmMethod() : event.getCancelMethod(),
+ TransactionStatus.Succeed.name().equals(event.getStatus()) ? event.getConfirmMethod() : event.getCancelMethod(),
event.getGlobalTxId(),
event.getLocalTxId(),
ex);
diff --git a/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/IndexController.java b/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/IndexController.java
index a86a0f6..cb7024f 100644
--- a/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/IndexController.java
+++ b/alpha/alpha-ui/src/main/java/org/apache/servicecomb/pack/alpha/ui/controller/IndexController.java
@@ -89,7 +89,7 @@ public class IndexController implements ErrorController {
//system load
systemInfoDTO.setSystemLoad(Math.round(
metricsEndpoint.metric("system.load.average.1m", null).getMeasurements().get(0).getValue()
- .floatValue() * 100) / 100);
+ .floatValue() * 100) / (float)100);
//thread
systemInfoDTO.setThreadsLive(