Skip to content

Commit a902aa2

Browse files
committed
Merge branch 'update-reactor-netty-version' into update/reactor-Dysprosium-RELEASE
# Conflicts: # transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/TransportImpl.java
2 parents 4d3754b + 82644a4 commit a902aa2

File tree

5 files changed

+56
-9
lines changed

5 files changed

+56
-9
lines changed

.github/release-drafter.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
template: |
2+
## What’s Changed
3+
4+
$CHANGES

cluster/src/test/java/io/scalecube/cluster/ClusterTest.java

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,52 @@ public class ClusterTest extends BaseTest {
3232
public static final Duration TIMEOUT = Duration.ofSeconds(30);
3333
public static final int CONNECT_TIMEOUT = 3000;
3434

35+
@Test
36+
public void testStartStopRepeatedly() throws Exception {
37+
Address address = Address.from("localhost:4848");
38+
39+
// Start seed node
40+
Cluster seedNode =
41+
new ClusterImpl()
42+
.gossip(opts -> opts.gossipInterval(100))
43+
.failureDetector(opts -> opts.pingInterval(100))
44+
.membership(opts -> opts.syncInterval(100))
45+
.transport(opts -> opts.host(address.host()).port(address.port()))
46+
.transport(opts -> opts.connectTimeout(CONNECT_TIMEOUT))
47+
.startAwait();
48+
49+
Cluster otherNode =
50+
new ClusterImpl()
51+
.membership(opts -> opts.seedMembers(address))
52+
.gossip(opts -> opts.gossipInterval(100))
53+
.failureDetector(opts -> opts.pingInterval(100))
54+
.membership(opts -> opts.syncInterval(100))
55+
.transport(opts -> opts.connectTimeout(CONNECT_TIMEOUT))
56+
.startAwait();
57+
58+
assertEquals(2, seedNode.members().size());
59+
assertEquals(2, otherNode.members().size());
60+
61+
for (int i = 0; i < 10; i++) {
62+
seedNode.shutdown();
63+
seedNode.onShutdown().then(Mono.delay(Duration.ofMillis(100))).block();
64+
65+
seedNode =
66+
new ClusterImpl()
67+
.gossip(opts -> opts.gossipInterval(100))
68+
.failureDetector(opts -> opts.pingInterval(100))
69+
.membership(opts -> opts.syncInterval(100))
70+
.transport(opts -> opts.host(address.host()).port(address.port()))
71+
.transport(opts -> opts.connectTimeout(CONNECT_TIMEOUT))
72+
.startAwait();
73+
74+
TimeUnit.SECONDS.sleep(1);
75+
76+
assertEquals(2, seedNode.members().size());
77+
assertEquals(2, otherNode.members().size());
78+
}
79+
}
80+
3581
@Test
3682
public void testMembersAccessFromScheduler() {
3783
// Start seed node

pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,11 @@
9090

9191
<!-- Jackson -->
9292
<dependency>
93-
<groupId>com.fasterxml.jackson.core</groupId>
94-
<artifactId>jackson-core</artifactId>
95-
<version>${jackson.version}</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>com.fasterxml.jackson.core</groupId>
99-
<artifactId>jackson-databind</artifactId>
93+
<groupId>com.fasterxml.jackson</groupId>
94+
<artifactId>jackson-bom</artifactId>
10095
<version>${jackson.version}</version>
96+
<type>pom</type>
97+
<scope>import</scope>
10198
</dependency>
10299

103100
<!-- Reactor -->

src/main/scripts/cd/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ check_tag_for_rc
5050

5151
mvn -P release -Darguments=-DskipTests release:prepare release:perform $MVN_RELEASE_VERSION $MVN_NEXT_VERSION -DautoVersionSubmodules=true -DscmCommentPrefix="$TRAVIS_COMMIT_MESSAGE [skip ci] " -B -V -s travis-settings.xml || exit 126
5252

53-
mvn clean
53+
mvn -B -q clean
5454

5555
if [ -z "$NEW_RC_VERSION" ]; then
5656
commit_to_develop

src/main/scripts/ci/before-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ latest=$(curl "https://oss.sonatype.org/service/local/repositories/releases/cont
1414

1515
echo Downloading latest version $latest of codacy reporter from sonatype
1616
# download latest assembly jar
17-
mvn dependency:get dependency:copy \
17+
mvn -B -q dependency:get dependency:copy \
1818
-DoutputDirectory=$HOME \
1919
-DoutputAbsoluteArtifactFilename=true \
2020
-Dmdep.stripVersion=true \

0 commit comments

Comments
 (0)