Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport stable/1.3] Java client accepts topologies with DEAD partitions #9435

Merged
2 commits merged into from
May 24, 2022
Merged

[Backport stable/1.3] Java client accepts topologies with DEAD partitions #9435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62bd86a
test: java client should accept dead partitions
lenaschoenburg May 20, 2022
210dcf1
fix: java client accepts `DEAD` partitions in topology
lenaschoenburg May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion clients/java/src/main/java/io/camunda/zeebe/client/api/response/PartitionBrokerHealth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@

public enum PartitionBrokerHealth {
HEALTHY,
UNHEALTHY
UNHEALTHY,
DEAD,
}
16 changes: 9 additions & 7 deletions clients/java/src/main/java/io/camunda/zeebe/client/impl/response/PartitionInfoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ public class PartitionInfoImpl implements PartitionInfo {
public PartitionInfoImpl(final GatewayOuterClass.Partition partition) {
partitionId = partition.getPartitionId();

if (partition.getRole() == GatewayOuterClass.Partition.PartitionBrokerRole.LEADER) {
if (partition.getRole() == Partition.PartitionBrokerRole.LEADER) {
role = PartitionBrokerRole.LEADER;
} else if (partition.getRole() == GatewayOuterClass.Partition.PartitionBrokerRole.FOLLOWER) {
} else if (partition.getRole() == Partition.PartitionBrokerRole.FOLLOWER) {
role = PartitionBrokerRole.FOLLOWER;
} else if (partition.getRole() == Partition.PartitionBrokerRole.INACTIVE) {
role = PartitionBrokerRole.INACTIVE;
Expand All @@ -43,11 +43,13 @@ public PartitionInfoImpl(final GatewayOuterClass.Partition partition) {
"Unexpected partition broker role %s, should be one of %s",
partition.getRole(), Arrays.toString(PartitionBrokerRole.values())));
}
if (partition.getHealth() == GatewayOuterClass.Partition.PartitionBrokerHealth.HEALTHY) {
this.partitionBrokerHealth = PartitionBrokerHealth.HEALTHY;
} else if (partition.getHealth()
== GatewayOuterClass.Partition.PartitionBrokerHealth.UNHEALTHY) {
this.partitionBrokerHealth = PartitionBrokerHealth.UNHEALTHY;

if (partition.getHealth() == Partition.PartitionBrokerHealth.HEALTHY) {
partitionBrokerHealth = PartitionBrokerHealth.HEALTHY;
} else if (partition.getHealth() == Partition.PartitionBrokerHealth.UNHEALTHY) {
partitionBrokerHealth = PartitionBrokerHealth.UNHEALTHY;
} else if (partition.getHealth() == Partition.PartitionBrokerHealth.DEAD) {
partitionBrokerHealth = PartitionBrokerHealth.DEAD;
} else {
throw new RuntimeException(
String.format(
Expand Down
20 changes: 20 additions & 0 deletions clients/java/src/test/java/io/camunda/zeebe/client/TopologyRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static io.camunda.zeebe.client.util.RecordingGatewayService.broker;
import static io.camunda.zeebe.client.util.RecordingGatewayService.partition;
import static io.camunda.zeebe.gateway.protocol.GatewayOuterClass.Partition.PartitionBrokerHealth.DEAD;
import static io.camunda.zeebe.gateway.protocol.GatewayOuterClass.Partition.PartitionBrokerHealth.HEALTHY;
import static io.camunda.zeebe.gateway.protocol.GatewayOuterClass.Partition.PartitionBrokerHealth.UNHEALTHY;
import static io.camunda.zeebe.gateway.protocol.GatewayOuterClass.Partition.PartitionBrokerRole.FOLLOWER;
Expand Down Expand Up @@ -119,6 +120,25 @@ public void shouldRequestTopology() {
tuple(1, PartitionBrokerRole.INACTIVE, PartitionBrokerHealth.UNHEALTHY));
}

@Test
public void shouldAcceptDeadPartitions() {
// given
gatewayService.onTopologyRequest(
1,
1,
1,
"1.22.3-SNAPSHOT",
broker(0, "host1", 123, "1.22.3-SNAPSHOT", partition(0, LEADER, DEAD)));

// when
final Topology topology = client.newTopologyRequest().send().join();

// then
assertThat(topology.getBrokers().get(0).getPartitions().get(0))
.extracting(PartitionInfo::getHealth)
.isEqualTo(PartitionBrokerHealth.DEAD);
}

@Test
public void shouldRaiseExceptionOnError() {
// given
Expand Down