Skip to content

Commit ced840f

Browse files
chaohengstudentchaohengstudent
authored
[COMMON] Replace NodeInfo with Broker (#1763)
1 parent 28ec2c6 commit ced840f

80 files changed

Lines changed: 566 additions & 947 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/src/main/java/org/astraea/app/backup/Backup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void restoreDistribution(ClusterInfo clusterInfo, String bootstrapServers
5050
.sorted(
5151
Comparator.comparing(
5252
replica -> !replica.isLeader()))
53-
.map(replica -> replica.nodeInfo().id())
53+
.map(replica -> replica.broker().id())
5454
.toList())))))
5555
.configs(topic.config().raw())
5656
.run()

‎app/src/main/java/org/astraea/app/performance/Performance.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ else if (specifiedByBroker) {
382382
.join()
383383
.replicaStream()
384384
.filter(Replica::isLeader)
385-
.filter(replica -> specifyBrokers.contains(replica.nodeInfo().id()))
385+
.filter(replica -> specifyBrokers.contains(replica.broker().id()))
386386
.map(replica -> TopicPartition.of(replica.topic(), replica.partition()))
387387
.distinct()
388388
.toList();

‎app/src/main/java/org/astraea/app/publisher/MetricPublisher.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.astraea.app.argument.StringMapField;
2626
import org.astraea.common.Utils;
2727
import org.astraea.common.admin.Admin;
28-
import org.astraea.common.admin.NodeInfo;
28+
import org.astraea.common.admin.Broker;
2929
import org.astraea.common.metrics.JndiClient;
3030
import org.astraea.common.metrics.collector.MetricFetcher;
3131

@@ -50,17 +50,17 @@ static void execute(Arguments arguments) {
5050
.clientSupplier(
5151
() ->
5252
admin
53-
.nodeInfos()
53+
.brokers()
5454
.thenApply(
55-
nodes ->
56-
nodes.stream()
55+
brokers ->
56+
brokers.stream()
5757
.collect(
5858
Collectors.toUnmodifiableMap(
59-
NodeInfo::id,
60-
node ->
59+
Broker::id,
60+
broker ->
6161
JndiClient.of(
62-
node.host(),
63-
arguments.idToJmxPort().apply(node.id()))))))
62+
broker.host(),
63+
arguments.idToJmxPort().apply(broker.id()))))))
6464
.fetchBeanDelay(arguments.period)
6565
.fetchMetadataDelay(Duration.ofMinutes(5))
6666
.threads(3)

‎app/src/main/java/org/astraea/app/web/BalancerHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ static class Placement {
255255
final Optional<Long> size;
256256

257257
Placement(Replica replica, Optional<Long> size) {
258-
this.brokerId = replica.nodeInfo().id();
258+
this.brokerId = replica.broker().id();
259259
this.directory = replica.path();
260260
this.size = size;
261261
}

‎app/src/main/java/org/astraea/app/web/BrokerHandler.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.concurrent.CompletionStage;
2626
import java.util.stream.Collectors;
2727
import org.astraea.common.admin.Admin;
28-
import org.astraea.common.admin.NodeInfo;
28+
import org.astraea.common.admin.Broker;
2929
import org.astraea.common.admin.TopicPartition;
3030

3131
class BrokerHandler implements Handler {
@@ -44,8 +44,12 @@ CompletionStage<Set<Integer>> brokers(Optional<String> target) {
4444
.orElseGet(
4545
() ->
4646
admin
47-
.nodeInfos()
48-
.thenApply(ns -> ns.stream().map(NodeInfo::id).collect(Collectors.toSet())));
47+
.brokers()
48+
.thenApply(
49+
ns ->
50+
ns.stream()
51+
.map(org.astraea.common.admin.Broker::id)
52+
.collect(Collectors.toSet())));
4953
} catch (NumberFormatException e) {
5054
return CompletableFuture.failedFuture(
5155
new NoSuchElementException("the broker id must be number"));

‎app/src/main/java/org/astraea/app/web/ReassignmentHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import java.util.stream.Stream;
3232
import org.astraea.common.FutureUtils;
3333
import org.astraea.common.admin.Admin;
34+
import org.astraea.common.admin.Broker;
3435
import org.astraea.common.admin.ClusterInfo;
35-
import org.astraea.common.admin.NodeInfo;
3636
import org.astraea.common.admin.Replica;
3737
import org.astraea.common.admin.TopicPartition;
3838
import org.astraea.common.admin.TopicPartitionReplica;
@@ -110,7 +110,7 @@ public CompletionStage<Response> post(Channel channel) {
110110
availableBrokers.stream()
111111
.filter(
112112
b -> b.topicPartitions().contains(tp))
113-
.map(NodeInfo::id)
113+
.map(Broker::id)
114114
.toList();
115115
if (!ids.isEmpty()) return ids;
116116
return List.of(
@@ -211,7 +211,7 @@ static class AddingReplica implements Response {
211211
AddingReplica(Replica addingReplica, long leaderSize) {
212212
this.topicName = addingReplica.topic();
213213
this.partition = addingReplica.partition();
214-
this.broker = addingReplica.nodeInfo().id();
214+
this.broker = addingReplica.broker().id();
215215
this.dataFolder = addingReplica.path();
216216
this.size = addingReplica.size();
217217
this.leaderSize = leaderSize;

‎app/src/main/java/org/astraea/app/web/SkewedPartitionScenario.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.apache.commons.math3.distribution.IntegerDistribution;
3131
import org.apache.commons.math3.util.Pair;
3232
import org.astraea.common.admin.Admin;
33-
import org.astraea.common.admin.NodeInfo;
33+
import org.astraea.common.admin.Broker;
3434
import org.astraea.common.admin.TopicPartition;
3535
import org.astraea.common.admin.TopicPartitionReplica;
3636

@@ -62,7 +62,7 @@ public CompletionStage<Result> apply(Admin admin) {
6262
admin.waitPartitionLeaderSynced(
6363
Map.of(topicName, partitions), Duration.ofSeconds(4)))
6464
.thenCompose(ignored -> admin.brokers())
65-
.thenApply(brokers -> brokers.stream().map(NodeInfo::id).sorted().toList())
65+
.thenApply(brokers -> brokers.stream().map(Broker::id).sorted().toList())
6666
.thenCompose(
6767
brokerIds -> {
6868
var distribution =

‎app/src/main/java/org/astraea/app/web/ThrottleHandler.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.astraea.common.EnumInfo;
3131
import org.astraea.common.FutureUtils;
3232
import org.astraea.common.admin.Admin;
33+
import org.astraea.common.admin.Broker;
3334
import org.astraea.common.admin.BrokerConfigs;
34-
import org.astraea.common.admin.NodeInfo;
3535
import org.astraea.common.admin.TopicConfigs;
3636
import org.astraea.common.admin.TopicPartitionReplica;
3737
import org.astraea.common.json.TypeRef;
@@ -100,9 +100,8 @@ public CompletionStage<Response> post(Channel channel) {
100100

101101
var topicToAppends =
102102
admin
103-
.nodeInfos()
104-
.thenApply(
105-
nodeInfos -> nodeInfos.stream().map(NodeInfo::id).collect(Collectors.toSet()))
103+
.brokers()
104+
.thenApply(brokers -> brokers.stream().map(Broker::id).collect(Collectors.toSet()))
106105
.thenCompose(admin::topicPartitionReplicas)
107106
.thenApply(
108107
replicas ->
@@ -197,9 +196,8 @@ public CompletionStage<Response> delete(Channel channel) {
197196

198197
var topicToSubtracts =
199198
admin
200-
.nodeInfos()
201-
.thenApply(
202-
nodeInfos -> nodeInfos.stream().map(NodeInfo::id).collect(Collectors.toSet()))
199+
.brokers()
200+
.thenApply(brokers -> brokers.stream().map(Broker::id).collect(Collectors.toSet()))
203201
.thenCompose(admin::topicPartitionReplicas)
204202
.thenApply(
205203
replicas -> {
@@ -251,11 +249,11 @@ public CompletionStage<Response> delete(Channel channel) {
251249

252250
var brokerToUnset =
253251
admin
254-
.nodeInfos()
252+
.brokers()
255253
.thenApply(
256254
ns ->
257255
ns.stream()
258-
.map(NodeInfo::id)
256+
.map(Broker::id)
259257
.filter(
260258
id ->
261259
!channel.queries().containsKey("broker")

‎app/src/main/java/org/astraea/app/web/TopicHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ private Replica() {
316316

317317
Replica(org.astraea.common.admin.Replica replica) {
318318
this(
319-
replica.nodeInfo().id(),
319+
replica.broker().id(),
320320
replica.lag(),
321321
replica.size(),
322322
replica.isLeader(),

‎app/src/main/java/org/astraea/app/web/WebService.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import org.astraea.common.Utils;
3939
import org.astraea.common.admin.Admin;
4040
import org.astraea.common.admin.Broker;
41-
import org.astraea.common.admin.NodeInfo;
4241
import org.astraea.common.metrics.JndiClient;
4342
import org.astraea.common.metrics.MBeanClient;
4443
import org.astraea.common.metrics.collector.MetricSensor;
@@ -76,7 +75,7 @@ public WebService(
7675
brokers.stream()
7776
.collect(
7877
Collectors.toUnmodifiableMap(
79-
NodeInfo::id,
78+
Broker::id,
8079
b -> JndiClient.of(b.host(), brokerIdToJmxPort.apply(b.id()))));
8180
yield List.of(
8281
MetricStore.Receiver.local(() -> admin.brokers().thenApply(asBeanClientMap)));

0 commit comments

Comments
 (0)