Skip to content

[Branch-2.10][fix][broker]fail to update partition meta of topic due to ConflictException: subscription already exists for topic #17488

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

Merged
Jason918 merged 1 commit into from
Sep 7, 2022
Merged

[Branch-2.10][fix][broker]fail to update partition meta of topic due to ConflictException: subscription already exists for topic #17488

Show file tree
Hide file tree
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
26 changes: 20 additions & 6 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 @@ -442,7 +442,8 @@ protected void internalUpdatePartitionedTopic(int numPartitions,
}
try {
tryCreatePartitionsAsync(numPartitions).get(DEFAULT_OPERATION_TIMEOUT_SEC, TimeUnit.SECONDS);
createSubscriptions(topicName, numPartitions).get(DEFAULT_OPERATION_TIMEOUT_SEC, TimeUnit.SECONDS);
createSubscriptions(topicName, numPartitions, force).get(DEFAULT_OPERATION_TIMEOUT_SEC,
TimeUnit.SECONDS);
} catch (Exception e) {
if (e.getCause() instanceof RestException) {
throw (RestException) e.getCause();
Expand Down Expand Up @@ -4127,7 +4128,7 @@ private PersistentReplicator getReplicatorReference(String replName, PersistentT

private CompletableFuture<Void> updatePartitionedTopic(TopicName topicName, int numPartitions, boolean force) {
CompletableFuture<Void> result = new CompletableFuture<>();
createSubscriptions(topicName, numPartitions).thenCompose(__ -> {
createSubscriptions(topicName, numPartitions, force).thenCompose(__ -> {
CompletableFuture<Void> future = namespaceResources().getPartitionedTopicResources()
.updatePartitionedTopicAsync(topicName, p -> new PartitionedTopicMetadata(numPartitions));
future.exceptionally(ex -> {
Expand Down Expand Up @@ -4164,8 +4165,10 @@ private CompletableFuture<Void> updatePartitionedTopic(TopicName topicName, int
*
* @param topicName : topic-name: persistent://prop/cluster/ns/topic
* @param numPartitions : number partitions for the topics
* @param ignoreConflictException : If true, ignore ConflictException: subscription already exists for topic
*/
private CompletableFuture<Void> createSubscriptions(TopicName topicName, int numPartitions) {
private CompletableFuture<Void> createSubscriptions(TopicName topicName, int numPartitions,
boolean ignoreConflictException) {
CompletableFuture<Void> result = new CompletableFuture<>();
pulsar().getBrokerService().fetchPartitionedTopicMetadataAsync(topicName).thenAccept(partitionMetadata -> {
if (partitionMetadata.partitions < 1) {
Expand Down Expand Up @@ -4200,9 +4203,20 @@ private CompletableFuture<Void> createSubscriptions(TopicName topicName, int num

for (int i = partitionMetadata.partitions; i < numPartitions; i++) {
final String topicNamePartition = topicName.getPartition(i).toString();

subscriptionFutures.add(admin.topics().createSubscriptionAsync(topicNamePartition,
subscription, MessageId.latest));
CompletableFuture<Void> future = new CompletableFuture<>();
admin.topics().createSubscriptionAsync(topicNamePartition,
subscription, MessageId.latest).whenComplete((__, ex) -> {
if (ex == null) {
future.complete(null);
} else {
if (ignoreConflictException && ex instanceof PulsarAdminException.ConflictException) {
future.complete(null);
} else {
future.completeExceptionally(ex);
}
}
});
subscriptionFutures.add(future);
}
});

Expand Down
8 changes: 8 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,9 +2464,17 @@ public void testFailedUpdatePartitionedTopic() throws Exception {
} catch (PulsarAdminException.PreconditionFailedException e) {
// Ok
}
assertEquals(admin.topics().getPartitionedTopicMetadata(partitionedTopicName).partitions, startPartitions);
admin.topics().updatePartitionedTopic(partitionedTopicName, newPartitions, false, true);
// validate subscription is created for new partition.
assertNotNull(admin.topics().getStats(partitionedTopicName + "-partition-" + 6).getSubscriptions().get(subName1));
for (int i = startPartitions; i < newPartitions; i++) {
assertNotNull(
admin.topics().getStats(partitionedTopicName + "-partition-" + i).getSubscriptions().get(subName1));
}

// validate update partition is success
assertEquals(admin.topics().getPartitionedTopicMetadata(partitionedTopicName).partitions, newPartitions);
}

@Test(dataProvider = "topicType")
Expand Down