HQebupt commented on code in PR #17251:
URL: https://github.com/apache/pulsar/pull/17251#discussion_r954724173
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java:
##########
@@ -4357,39 +4357,50 @@ private PersistentReplicator
getReplicatorReference(String replName, PersistentT
}
}
+ private CompletableFuture<Void> updatePartitionedTopicMetadataAsync(int
numPartitions) {
+ CompletableFuture<Void> future =
namespaceResources().getPartitionedTopicResources()
+ .updatePartitionedTopicAsync(topicName, p -> new
PartitionedTopicMetadata(numPartitions, p.properties));
+ future.exceptionally(ex -> {
+ // If the update operation fails, clean up the partitions that
were created
+ getPartitionedTopicMetadataAsync(topicName, false,
false).thenAccept(metadata -> {
+ int oldPartition = metadata.partitions;
+ for (int i = oldPartition; i < numPartitions; i++) {
+
topicResources().deletePersistentTopicAsync(topicName.getPartition(i)).exceptionally(ex1
-> {
+ log.warn("[{}] Failed to clean up managedLedger {}",
clientAppId(), topicName,
+ ex1.getCause());
+ return null;
+ });
+ }
+ }).exceptionally(e -> {
+ log.warn("[{}] Failed to clean up managedLedger", topicName,
e);
+ return null;
+ });
+ return null;
+ });
+ return future;
+ }
private CompletableFuture<Void> updatePartitionedTopic(TopicName
topicName, int numPartitions, boolean force) {
CompletableFuture<Void> result = new CompletableFuture<>();
- createSubscriptions(topicName, numPartitions).thenCompose(__ -> {
- CompletableFuture<Void> future =
namespaceResources().getPartitionedTopicResources()
- .updatePartitionedTopicAsync(topicName, p ->
- new PartitionedTopicMetadata(numPartitions,
p.properties));
- future.exceptionally(ex -> {
- // If the update operation fails, clean up the partitions that
were created
- getPartitionedTopicMetadataAsync(topicName, false,
false).thenAccept(metadata -> {
- int oldPartition = metadata.partitions;
- for (int i = oldPartition; i < numPartitions; i++) {
-
topicResources().deletePersistentTopicAsync(topicName.getPartition(i)).exceptionally(ex1
-> {
- log.warn("[{}] Failed to clean up managedLedger
{}", clientAppId(), topicName,
- ex1.getCause());
+ createSubscriptions(topicName, numPartitions).thenCompose(
+ __ ->
updatePartitionedTopicMetadataAsync(numPartitions))
+ .thenAccept(__ -> result.complete(null))
+ .exceptionally(ex -> {
+ if (force && ex.getCause() instanceof
PulsarAdminException.ConflictException) {
+ log.warn("[{}] update partitioned topic's partition
num {} with ignoring conflict exception",
Review Comment:
1. I don't think so. The Conflict exception can ignore only when `force` is
true. It is better to keep as it is .
> it's better handle the exception in createSubscriptions
2. The `createSubscriptions` can make sure all the subscriptions are created
because of the internal `FutureUtil.waitForAll` .
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
