Skip to content

Commit 0b92a79

Browse files
committed
Run only recovery tests
1 parent 741de6a commit 0b92a79

File tree

3 files changed

+29
-34
lines changed

3 files changed

+29
-34
lines changed

.github/workflows/test-pr.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,38 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Checkout tls-gen
15-
uses: actions/checkout@v4
16-
with:
17-
repository: rabbitmq/tls-gen
18-
path: './tls-gen'
14+
# - name: Checkout tls-gen
15+
# uses: actions/checkout@v4
16+
# with:
17+
# repository: rabbitmq/tls-gen
18+
# path: './tls-gen'
1919
- name: Set up JDK
2020
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'temurin'
2323
java-version: '21'
2424
cache: 'maven'
25-
- name: Start broker
26-
run: ci/start-broker.sh
27-
- name: Test (no dynamic-batch publishing)
28-
run: |
29-
./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
30-
-Drabbitmq.stream.producer.dynamic.batch=false \
31-
-Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
32-
-Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
33-
-Dclient.key=./tls-gen/basic/result/client_$(hostname)_key.pem
34-
- name: Test (dynamic-batch publishing)
35-
run: |
36-
./mvnw test -Drabbitmqctl.bin=DOCKER:rabbitmq \
37-
-Drabbitmq.stream.producer.dynamic.batch=true \
38-
-Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
39-
-Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
40-
-Dclient.key=./tls-gen/basic/result/client_$(hostname)_key.pem
41-
- name: Stop broker
42-
run: docker stop rabbitmq && docker rm rabbitmq
25+
# - name: Start broker
26+
# run: ci/start-broker.sh
27+
# - name: Test (no dynamic-batch publishing)
28+
# run: |
29+
# ./mvnw verify -Drabbitmqctl.bin=DOCKER:rabbitmq \
30+
# -Drabbitmq.stream.producer.dynamic.batch=false \
31+
# -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
32+
# -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
33+
# -Dclient.key=./tls-gen/basic/result/client_$(hostname)_key.pem
34+
# - name: Test (dynamic-batch publishing)
35+
# run: |
36+
# ./mvnw test -Drabbitmqctl.bin=DOCKER:rabbitmq \
37+
# -Drabbitmq.stream.producer.dynamic.batch=true \
38+
# -Dca.certificate=./tls-gen/basic/result/ca_certificate.pem \
39+
# -Dclient.certificate=./tls-gen/basic/result/client_$(hostname)_certificate.pem \
40+
# -Dclient.key=./tls-gen/basic/result/client_$(hostname)_key.pem
41+
# - name: Stop broker
42+
# run: docker stop rabbitmq && docker rm rabbitmq
4343
- name: Start cluster
4444
run: ci/start-cluster.sh
4545
- name: Test against cluster
46-
run: ./mvnw test -Dtest="*ClusterTest" -Drabbitmqctl.bin=DOCKER:rabbitmq0
46+
run: ./mvnw test -Dtest="RecoveryClusterTest" -Drabbitmqctl.bin=DOCKER:rabbitmq0
4747
- name: Stop cluster
4848
run: docker compose --file ci/cluster/docker-compose.yml down

src/main/java/com/rabbitmq/stream/impl/StreamEnvironment.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -905,11 +905,7 @@ TrackingConsumerRegistration registerTrackingConsumer(
905905
public String toString() {
906906
return "{ \"locators\" : ["
907907
+ this.locators.stream()
908-
.map(
909-
l -> {
910-
Client c = l.nullableClient();
911-
return c == null ? "null" : ("\"" + l.label() + "\"");
912-
})
908+
.map(l -> quote(l.label()))
913909
.collect(Collectors.joining(","))
914910
+ "], "
915911
+ Utils.jsonField("producer_client_count", this.producersCoordinator.clientCount())

src/test/java/com/rabbitmq/stream/impl/RecoveryClusterTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,8 @@ public class RecoveryClusterTest {
7272
static List<Level> logLevels;
7373
static List<Class<?>> logClasses =
7474
List.of(
75-
ProducersCoordinator.class,
76-
ConsumersCoordinator.class,
77-
StreamEnvironment.class,
75+
// ProducersCoordinator.class,
76+
// ConsumersCoordinator.class,
7877
AsyncRetry.class,
7978
StreamEnvironment.class,
8079
ScheduledExecutorServiceWrapper.class);
@@ -126,9 +125,9 @@ static void tearDownAll() {
126125

127126
@ParameterizedTest
128127
@CsvSource({
129-
"false,false",
128+
// "false,false",
130129
"true,true",
131-
"true,false",
130+
// "true,false",
132131
})
133132
void clusterRestart(boolean useLoadBalancer, boolean forceLeader) throws InterruptedException {
134133
LOGGER.info(

0 commit comments

Comments
 (0)