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/08 09:14:51 UTC
[incubator-servicecomb-saga] branch SCB-168_load_balance updated
(4dc87b0 -> 728e470)
This is an automated email from the ASF dual-hosted git repository.
seanyinx pushed a change to branch SCB-168_load_balance
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.
omit 4dc87b0 SCB-168 removed default logging from spring boot
omit 17aece5 SCB-168 omega made use of log4j2 only in test
new a85cc1b SCB-168 removed default logging from spring boot
new 728e470 SCB-168 connected to alpha on start
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4dc87b0)
\
N -- N -- N refs/heads/SCB-168_load_balance (728e470)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.../apache/servicecomb/saga/integration/pack/tests/PackIT.java | 4 ++--
.../servicecomb/saga/omega/format/KryoMessageFormatTest.java | 6 +++---
.../servicecomb/saga/omega/format/MessageFormatTestBase.java | 9 ++-------
.../apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java | 6 +++++-
4 files changed, 12 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>'].
[incubator-servicecomb-saga] 02/02: SCB-168 connected to alpha on
start
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seanyinx pushed a commit to branch SCB-168_load_balance
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 728e470168d0d257a03b46e83c577e07ee554391
Author: seanyinx <se...@huawei.com>
AuthorDate: Mon Jan 8 17:14:35 2018 +0800
SCB-168 connected to alpha on start
Signed-off-by: seanyinx <se...@huawei.com>
---
.../org/apache/servicecomb/saga/integration/pack/tests/PackIT.java | 4 ++--
.../org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
index 66454b7..fa0a3ed 100644
--- a/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
+++ b/integration-tests/pack-tests/src/test/java/org/apache/servicecomb/saga/integration/pack/tests/PackIT.java
@@ -70,7 +70,7 @@ public class PackIT {
repository.deleteAll();
}
- @Test
+ @Test(timeout = 5000)
public void updatesTxStateToAlpha() throws Exception {
HttpHeaders headers = new HttpHeaders();
@@ -116,7 +116,7 @@ public class PackIT {
assertThat(compensatedMessages.isEmpty(), is(true));
}
- @Test
+ @Test(timeout = 5000)
public void compensatesFailedGlobalTransaction() throws Exception {
HttpHeaders headers = new HttpHeaders();
diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
index 5c6a397..b5d118a 100644
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
+++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
@@ -63,7 +63,11 @@ class OmegaSpringConfig {
serviceConfig,
handler);
- Runtime.getRuntime().addShutdownHook(new Thread(sender::close));
+ sender.onConnected();
+ Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+ sender.onDisconnected();
+ sender.close();
+ }));
return sender;
}
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.
[incubator-servicecomb-saga] 01/02: SCB-168 removed default logging
from spring boot
Posted by se...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
seanyinx pushed a commit to branch SCB-168_load_balance
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit a85cc1b175eab0c1c0fa7dd8dea9fedd52485fb3
Author: seanyinx <se...@huawei.com>
AuthorDate: Mon Jan 8 16:45:12 2018 +0800
SCB-168 removed default logging from spring boot
Signed-off-by: seanyinx <se...@huawei.com>
---
omega/omega-connector/omega-connector-grpc/pom.xml | 5 ++++-
.../servicecomb/saga/omega/format/KryoMessageFormatTest.java | 6 +++---
.../servicecomb/saga/omega/format/MessageFormatTestBase.java | 9 ++-------
omega/omega-spring-tx/pom.xml | 6 ++++++
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/omega/omega-connector/omega-connector-grpc/pom.xml b/omega/omega-connector/omega-connector-grpc/pom.xml
index ba001c9..7f640aa 100644
--- a/omega/omega-connector/omega-connector-grpc/pom.xml
+++ b/omega/omega-connector/omega-connector-grpc/pom.xml
@@ -52,19 +52,22 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
+ <scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
index 1f63d74..327b6ec 100644
--- a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
+++ b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/KryoMessageFormatTest.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.saga.omega.format;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertThat;
import org.junit.BeforeClass;
@@ -32,10 +32,10 @@ public class KryoMessageFormatTest extends MessageFormatTestBase {
@Test
public void serializeEmptyClassIntoBytes() {
- byte[] bytes = format.serialize(eventOf(new EmptyClass()));
+ byte[] bytes = format.serialize(new Object[]{new EmptyClass()});
Object[] message = format.deserialize(bytes);
- assertThat(message[0] instanceof EmptyClass, is(true));
+ assertThat(message[0], instanceOf(EmptyClass.class));
}
}
diff --git a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
index d3c591e..aab6ad7 100644
--- a/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
+++ b/omega/omega-format/src/test/java/org/apache/servicecomb/saga/omega/format/MessageFormatTestBase.java
@@ -26,7 +26,6 @@ import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertThat;
import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
import org.junit.Ignore;
import org.junit.Test;
@@ -37,7 +36,7 @@ public class MessageFormatTestBase {
@Test
public void serializeObjectIntoBytes() throws Exception {
- byte[] bytes = format.serialize(new String[]{"hello", "world"});
+ byte[] bytes = format.serialize(new Object[]{"hello", "world"});
Object[] message = format.deserialize(bytes);
@@ -46,7 +45,7 @@ public class MessageFormatTestBase {
@Test
public void serializeNullIntoBytes() throws Exception {
- byte[] bytes = format.serialize(eventOf((Object[]) null));
+ byte[] bytes = format.serialize(null);
Object[] message = format.deserialize(bytes);
@@ -63,10 +62,6 @@ public class MessageFormatTestBase {
}
}
- TxEvent eventOf(Object... payloads) {
- return new TxEvent(null, null, null, null, payloads);
- }
-
static class EmptyClass {
}
}
diff --git a/omega/omega-spring-tx/pom.xml b/omega/omega-spring-tx/pom.xml
index 022f0ba..2279067 100644
--- a/omega/omega-spring-tx/pom.xml
+++ b/omega/omega-spring-tx/pom.xml
@@ -31,6 +31,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicecomb.saga</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.