Skip to content

[fix][broker] fix error process in admin.updateTopicPartition #25042

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

Open
TakaHiR07 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix][broker] fix error process in admin.updateTopicPartition #25042

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 31 additions & 30 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,37 +418,31 @@ protected CompletableFuture<Void> internalCreateNonPartitionedTopicAsync(boolean
} else {
checkFuture = CompletableFuture.completedFuture(null);
}
return checkFuture.thenCompose(topics -> {
final CompletableFuture<Void> updateMetadataFuture = (expectPartitions == currentMetadataPartitions)
// current metadata partitions is equals to expect partitions
? CompletableFuture.completedFuture(null)
// update current cluster topic metadata
: namespaceResources().getPartitionedTopicResources()
.updatePartitionedTopicAsync(topicName, m ->
new PartitionedTopicMetadata(expectPartitions, m.properties));
return updateMetadataFuture

return checkFuture
// create missing partitions
.thenCompose(__ -> tryCreatePartitionsAsync(expectPartitions))
.thenCompose(topics -> tryCreatePartitionsAsync(expectPartitions))
// because we should consider the compatibility.
// Copy subscriptions from partition 0 instead of being created by the customer
.thenCompose(__ ->
admin.topics().getStatsAsync(topicName.getPartition(0).toString())
.thenCompose(stats -> {
List<CompletableFuture<Void>> futures = stats.getSubscriptions().entrySet()
// We must not re-create non-durable subscriptions on the new partitions
.thenCompose(stats -> {
List<CompletableFuture<Void>> futures =
stats.getSubscriptions().entrySet()
// We must not re-create non-durable subscriptions on the new partitions
.stream().filter(entry -> entry.getValue().isDurable())
.map(entry -> {
final List<CompletableFuture<Void>> innerFutures =
new ArrayList<>(expectPartitions);
for (int i = 0; i < expectPartitions; i++) {
innerFutures.add(admin.topics().createSubscriptionAsync(
topicName.getPartition(i).toString(),
topicName.getPartition(i).toString(),
entry.getKey(), MessageId.earliest,
entry.getValue().isReplicated(),
entry.getValue().getSubscriptionProperties())
.exceptionally(ex -> {
Throwable rc =
FutureUtil.unwrapCompletionException(ex);
Throwable rc = FutureUtil
.unwrapCompletionException(ex);
if (!(rc instanceof PulsarAdminException
.ConflictException)) {
log.warn("[{}] got an error while copying"
Expand All @@ -463,15 +457,21 @@ protected CompletableFuture<Void> internalCreateNonPartitionedTopicAsync(boolean
}
return FutureUtil.waitForAll(innerFutures);
}).collect(Collectors.toList());
return FutureUtil.waitForAll(futures);
})
);
}).thenCompose(__ -> {
if (updateLocal || !topicName.isGlobal()) {
return CompletableFuture.completedFuture(null);
}
// update remote cluster
return getReplicationClusters()
return FutureUtil.waitForAll(futures);
})
).thenCompose(__ -> (expectPartitions == currentMetadataPartitions)
// current metadata partitions is equals to expect partitions
? CompletableFuture.completedFuture(null)
// update current cluster topic metadata
: namespaceResources().getPartitionedTopicResources()
.updatePartitionedTopicAsync(topicName, m ->
new PartitionedTopicMetadata(expectPartitions, m.properties))
).thenCompose(__ -> {
if (updateLocal || !topicName.isGlobal()) {
return CompletableFuture.completedFuture(null);
}
// update remote cluster
return getReplicationClusters()
.thenCompose(replicationClusters -> {
if (replicationClusters == null || replicationClusters.isEmpty()) {
return CompletableFuture.completedFuture(null);
Expand All @@ -492,19 +492,20 @@ protected CompletableFuture<Void> internalCreateNonPartitionedTopicAsync(boolean
List<CompletableFuture<Void>> futures = replicationClusters.stream()
.map(replicationCluster -> admin.clusters().getClusterAsync(replicationCluster)
.thenCompose(clusterData -> pulsarService.getBrokerService()
.getClusterPulsarAdmin(replicationCluster, Optional.of(clusterData))
.getClusterPulsarAdmin(replicationCluster,
Optional.of(clusterData))
.topics().updatePartitionedTopicAsync(topicName.toString(),
expectPartitions, true, force)
expectPartitions, true, force)
.exceptionally(ex -> {
log.warn("[{}][{}] Update remote cluster partition fail.",
topicName, replicationCluster, ex);
throw FutureUtil.wrapToCompletionException(ex);
throw FutureUtil.wrapToCompletionException(ex);
})
)
).collect(Collectors.toList());
return FutureUtil.waitForAll(futures);
return FutureUtil.waitForAll(futures);
});
});
});
});
}

Expand Down
Loading