Skip to content

[improve][broker]add NamespacePolicies and AntiAffinity check before unload in checkNamespaceBundleSplit #16780

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
gaozhangmin merged 1 commit into from
Jan 11, 2023
Merged

[improve][broker]add NamespacePolicies and AntiAffinity check before unload in checkNamespaceBundleSplit #16780

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
6 changes: 3 additions & 3 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/BundleSplitStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.pulsar.broker.loadbalance;

import java.util.Set;
import java.util.Map;
import org.apache.pulsar.broker.PulsarService;

/**
Expand All @@ -33,7 +33,7 @@ public interface BundleSplitStrategy {
* leader broker).
* @param pulsar
* Service to use.
* @return A set of the bundles that should be split.
* @return A map of the bundles that should be split and the brokers on which they reside.
*/
Set<String> findBundlesToSplit(LoadData loadData, PulsarService pulsar);
Map<String, String> findBundlesToSplit(LoadData loadData, PulsarService pulsar);
}
12 changes: 5 additions & 7 deletions ...ar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
package org.apache.pulsar.broker.loadbalance.impl;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.loadbalance.BundleSplitStrategy;
Expand All @@ -38,7 +36,7 @@
*/
public class BundleSplitterTask implements BundleSplitStrategy {
private static final Logger log = LoggerFactory.getLogger(BundleSplitStrategy.class);
private final Set<String> bundleCache;
private final Map<String, String> bundleCache;

private final Map<String, Integer> namespaceBundleCount;

Expand All @@ -48,7 +46,7 @@ public class BundleSplitterTask implements BundleSplitStrategy {
*
*/
public BundleSplitterTask() {
bundleCache = new HashSet<>();
bundleCache = new HashMap<>();
namespaceBundleCount = new HashMap<>();
}

Expand All @@ -61,10 +59,10 @@ public BundleSplitterTask() {
* @param pulsar
* Service to use.
* @return All bundles who have exceeded configured thresholds in number of topics, number of sessions, total
* message rates, or total throughput.
* message rates, or total throughput and the brokers on which they reside.
*/
@Override
public Set<String> findBundlesToSplit(final LoadData loadData, final PulsarService pulsar) {
public Map<String, String> findBundlesToSplit(final LoadData loadData, final PulsarService pulsar) {
bundleCache.clear();
namespaceBundleCount.clear();
final ServiceConfiguration conf = pulsar.getConfiguration();
Expand Down Expand Up @@ -108,7 +106,7 @@ public Set<String> findBundlesToSplit(final LoadData loadData, final PulsarServi
maxBundleSessions, totalMessageRate, maxBundleMsgRate,
totalMessageThroughput / LoadManagerShared.MIBI,
maxBundleBandwidth / LoadManagerShared.MIBI);
bundleCache.add(bundle);
bundleCache.put(bundle, broker);
int bundleNum = namespaceBundleCount.getOrDefault(namespace, 0);
namespaceBundleCount.put(namespace, bundleNum + 1);
} else {
Expand Down
16 changes: 12 additions & 4 deletions ...roker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,10 +748,10 @@ public void checkNamespaceBundleSplit() {
}
final boolean unloadSplitBundles = pulsar.getConfiguration().isLoadBalancerAutoUnloadSplitBundlesEnabled();
synchronized (bundleSplitStrategy) {
final Set<String> bundlesToBeSplit = bundleSplitStrategy.findBundlesToSplit(loadData, pulsar);
final Map<String, String> bundlesToBeSplit = bundleSplitStrategy.findBundlesToSplit(loadData, pulsar);
NamespaceBundleFactory namespaceBundleFactory = pulsar.getNamespaceService().getNamespaceBundleFactory();
int splitCount = 0;
for (String bundleName : bundlesToBeSplit) {
for (String bundleName : bundlesToBeSplit.keySet()) {
try {
final String namespaceName = LoadManagerShared.getNamespaceNameFromBundleName(bundleName);
final String bundleRange = LoadManagerShared.getBundleRangeFromBundleName(bundleName);
Expand All @@ -768,9 +768,17 @@ public void checkNamespaceBundleSplit() {
.invalidateBundleCache(NamespaceName.get(namespaceName));
deleteBundleDataFromMetadataStore(bundleName);

log.info("Load-manager splitting bundle {} and unloading {}", bundleName, unloadSplitBundles);
// Check NamespacePolicies and AntiAffinityNamespace support unload bundle.
boolean isUnload = false;
String broker = bundlesToBeSplit.get(bundleName);
if (unloadSplitBundles
&& shouldNamespacePoliciesUnload(namespaceName, bundleRange, broker)
&& shouldAntiAffinityNamespaceUnload(namespaceName, bundleRange, broker)) {
isUnload = true;
}
log.info("Load-manager splitting bundle {} and unloading {}", bundleName, isUnload);
pulsar.getAdminClient().namespaces().splitNamespaceBundle(namespaceName, bundleRange,
unloadSplitBundles, null);
isUnload, null);

splitCount++;
log.info("Successfully split namespace bundle {}", bundleName);
Expand Down
5 changes: 2 additions & 3 deletions ...roker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/BundleSplitterTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;

/**
* @author hezhangjian
Expand Down Expand Up @@ -92,7 +91,7 @@ public void testSplitTaskWhenTopicJustOne() {
bundleData.setLongTermData(averageMessageData);
loadData.getBundleData().put("ten/ns/0x00000000_0x80000000", bundleData);

final Set<String> bundlesToSplit = bundleSplitterTask.findBundlesToSplit(loadData, pulsar);
final Map<String, String> bundlesToSplit = bundleSplitterTask.findBundlesToSplit(loadData, pulsar);
Assert.assertEquals(bundlesToSplit.size(), 0);
}

Expand Down Expand Up @@ -142,7 +141,7 @@ public void testLoadBalancerNamespaceMaximumBundles() throws Exception {
loadData.getBundleData().put("ten/ns/0x40000000_0x60000000", bundleData3);

int currentBundleCount = pulsar.getNamespaceService().getBundleCount(NamespaceName.get("ten/ns"));
final Set<String> bundlesToSplit = bundleSplitterTask.findBundlesToSplit(loadData, pulsar);
final Map<String, String> bundlesToSplit = bundleSplitterTask.findBundlesToSplit(loadData, pulsar);
Assert.assertEquals(bundlesToSplit.size() + currentBundleCount,
pulsar.getConfiguration().getLoadBalancerNamespaceMaximumBundles());
}
Expand Down
5 changes: 5 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,6 +752,11 @@ public void testModularLoadManagerSplitBundle() throws Exception {
assertNotEquals(pulsar2.getNamespaceService().getBundle(topicName), bundleInBroker2);
});

// Unload the NamespacePolicies and AntiAffinity check.
String currentBroker = String.format("%s:%d", "localhost", pulsar.getListenPortHTTP().get());
assertTrue(loadManager.shouldNamespacePoliciesUnload(namespace,"0x00000000_0xffffffff", currentBroker));
assertTrue(loadManager.shouldAntiAffinityNamespaceUnload(namespace,"0x00000000_0xffffffff", currentBroker));

// (7) Make lookup request again to Broker-2 which should succeed.
final String topic3 = "persistent://" + namespace + "/topic3";
@Cleanup
Expand Down