Skip to content

[fix][broker]Fix removing replica clusters on topic-policies not take effect #16144

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
codelipenghui merged 2 commits into from
Jul 4, 2022
Merged

[fix][broker]Fix removing replica clusters on topic-policies not take effect #16144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42db69e
Fix removing replica clusters on topic-policies not take effect
AnonHxy Jun 20, 2022
afed43d
Fix UT TopicPoliciesTest#testGetSetSubscribeRate
AnonHxy Jun 21, 2022
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
9 changes: 4 additions & 5 deletions 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 @@ -305,7 +305,6 @@ public PersistentTopic(String topic, ManagedLedger ledger, BrokerService brokerS
@Override
public CompletableFuture<Void> initialize() {
List<CompletableFuture<Void>> futures = new ArrayList<>();
futures.add(initTopicPolicy());
for (ManagedCursor cursor : ledger.getCursors()) {
if (cursor.getName().startsWith(replicatorPrefix)) {
String localCluster = brokerService.pulsar().getConfiguration().getClusterName();
Expand Down Expand Up @@ -341,7 +340,9 @@ public CompletableFuture<Void> initialize() {
this.isEncryptionRequired = policies.encryption_required;

isAllowAutoUpdateSchema = policies.is_allow_auto_update_schema;
}).exceptionally(ex -> {
})
.thenCompose(ignore -> initTopicPolicy())
.exceptionally(ex -> {
log.warn("[{}] Error getting policies {} and isEncryptionRequired will be set to false",
topic, ex.getMessage());
isEncryptionRequired = false;
Expand Down Expand Up @@ -3023,9 +3024,7 @@ public void onUpdate(TopicPolicies policies) {
updateSubscribeRateLimiter();
replicators.forEach((name, replicator) -> replicator.updateRateLimiter());
checkMessageExpiry();
if (policies.getReplicationClusters() != null) {
checkReplicationAndRetryOnFailure();
}
checkReplicationAndRetryOnFailure();

checkDeduplicationStatus();

Expand Down
31 changes: 31 additions & 0 deletions ...ar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTopicPoliciesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import com.google.common.collect.Sets;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.api.PulsarClientException;
Expand Down Expand Up @@ -731,6 +735,33 @@ public void testReplicatorOffloadPolicies() throws Exception {
assertNull(admin3.topicPolicies(true).getOffloadPolicies(persistentTopicName)));
}

@Test
public void testRemoveReplicationClusters() throws Exception {
final String namespace = "pulsar/partitionedNs-" + UUID.randomUUID();
final String persistentTopicName = "persistent://" + namespace + "/topic" + UUID.randomUUID();

init(namespace, persistentTopicName);

// set topic replica cluster policy as `r1 r2`
admin1.topics().setReplicationClusters(persistentTopicName, Arrays.asList("r1", "r2"));
PersistentTopic topicRef =
(PersistentTopic) pulsar1.getBrokerService().getTopicReference(persistentTopicName + "-partition-0").get();
assertNotNull(topicRef);

Awaitility.await().untilAsserted(() -> {
List<String> replicaClusters = topicRef.getReplicators().keys().stream().sorted().collect(Collectors.toList());
assertEquals(replicaClusters.size(), 1);
assertEquals(replicaClusters.toString(), "[r2]");
});

// removing topic replica cluster policy, so namespace policy should take effect
admin1.topics().removeReplicationClusters(persistentTopicName);
Awaitility.await().untilAsserted(() -> {
List<String> replicaClusters = topicRef.getReplicators().keys().stream().sorted().collect(Collectors.toList());
assertEquals(replicaClusters.size(), 2);
assertEquals(replicaClusters.toString(), "[r2, r3]");
});
}

private void init(String namespace, String topic)
throws PulsarAdminException, PulsarClientException, PulsarServerException {
Expand Down