Skip to content

[fix][broker]Incorrect source side topic permission deletion when disabling replication #26479

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
poorbarcode wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −1
Open

[fix][broker]Incorrect source side topic permission deletion when disabling replication #26479

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
8 changes: 7 additions & 1 deletion pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@
CompactedTopicImpl compactedTopic = pulsarTopicCompactionService.getCompactedTopic();
return new PulsarCompactorSubscription(this, compactedTopic, subscriptionName, cursor);
} else {
return new PersistentSubscription(this, subscriptionName, cursor, replicated, subscriptionProperties);

Check warning on line 666 in pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java

View workflow job for this annotation

GitHub Actions / Build and License check 

[deprecation] PersistentSubscription(PersistentTopic,String,ManagedCursor,Boolean,Map<String,String>) in PersistentSubscription has been deprecated
}
}

Expand Down Expand Up @@ -1680,7 +1680,13 @@

closeClientFuture.thenAccept(__ -> {
CompletableFuture<Void> deleteTopicAuthenticationFuture = new CompletableFuture<>();
brokerService.deleteTopicAuthenticationWithRetry(topic, deleteTopicAuthenticationFuture, 5);
checkAllowedCluster(brokerService.getPulsar().getConfig().getClusterName()).thenAccept(allow -> {
if (!allow) {
deleteTopicAuthenticationFuture.complete(null);
} else {
brokerService.deleteTopicAuthenticationWithRetry(topic, deleteTopicAuthenticationFuture, 5);
}
});

deleteTopicAuthenticationFuture.thenCompose(ignore -> deleteSchema())
.thenCompose(ignore -> deleteTopicPolicies())
Expand Down
38 changes: 38 additions & 0 deletions ...ker/src/test/java/org/apache/pulsar/broker/service/OneWayReplicatorUsingGlobalZKTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static org.apache.pulsar.broker.service.TopicPoliciesService.GetType.GLOBAL_ONLY;
import static org.apache.pulsar.broker.service.TopicPoliciesService.GetType.LOCAL_ONLY;
import static org.assertj.core.api.Assertions.assertThat;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotNull;
Expand All @@ -28,6 +29,7 @@
import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Expand All @@ -51,6 +53,7 @@
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.AuthAction;
import org.apache.pulsar.common.policies.data.AutoFailoverPolicyData;
import org.apache.pulsar.common.policies.data.AutoFailoverPolicyType;
import org.apache.pulsar.common.policies.data.AutoTopicCreationOverride;
Expand Down Expand Up @@ -120,6 +123,41 @@ public void testReplicatorCreateTopic(boolean isPartitioned) throws Exception {
super.testReplicatorCreateTopic(isPartitioned);
}

@Test
public void testDeletingTopicOnOneClusterKeepsSharedTopicPermissions() throws Exception {
String topic = BrokerTestUtil.newUniqueName("persistent://" + replicatedNamespace + "/topic-permissions-");
String role = "test-role";
Set<AuthAction> permissions = EnumSet.of(AuthAction.produce, AuthAction.consume);

admin1.topics().createNonPartitionedTopic(topic);
waitReplicatorStarted(topic);
admin1.topics().grantPermission(topic, role, permissions);
Awaitility.await().untilAsserted(() -> {
assertThat(admin1.topics().getPermissions(topic)).containsEntry(role, permissions);
assertThat(admin2.topics().getPermissions(topic)).containsEntry(role, permissions);
});

admin1.topicPolicies(true).setReplicationClusters(topic, Arrays.asList(cluster1));
Awaitility.await().untilAsserted(() -> {
assertFalse(admin2.topics().getList(replicatedNamespace).contains(topic));
assertThat(admin1.topics().getPermissions(topic)).containsEntry(role, permissions);
});

admin1.topicPolicies(true).setReplicationClusters(topic, Arrays.asList(cluster1, cluster2));
Awaitility.await().untilAsserted(() -> {
assertThat(admin1.topics().getPermissions(topic)).containsEntry(role, permissions);
assertThat(admin2.topics().getPermissions(topic)).containsEntry(role, permissions);
});

// clear topic.
admin1.topicPolicies(true).setReplicationClusters(topic, Arrays.asList(cluster1));
Awaitility.await().untilAsserted(() -> {
assertFalse(admin2.topics().getList(replicatedNamespace).contains(topic));
assertThat(admin1.topics().getPermissions(topic)).containsEntry(role, permissions);
});
admin1.topics().delete(topic);
}

@Override
@Test
public void testDeleteRemoteTopicByGlobalPolicy() throws Exception {
Expand Down
Loading