You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by kw...@apache.org on 2023/03/14 07:42:59 UTC
[pulsar] branch master updated: [improve][broker] PIP-192 Supports AntiAffinityGroupPolicy (#19708)
This is an automated email from the ASF dual-hosted git repository.
kwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 2ddfbfe8ce1 [improve][broker] PIP-192 Supports AntiAffinityGroupPolicy (#19708)
2ddfbfe8ce1 is described below
commit 2ddfbfe8ce11f3ff66df53a164570335e573bef4
Author: Heesung Sohn <10...@users.noreply.github.com>
AuthorDate: Tue Mar 14 00:42:47 2023 -0700
[improve][broker] PIP-192 Supports AntiAffinityGroupPolicy (#19708)
Master Issue: https://github.com/apache/pulsar/issues/16691
### Motivation
Raising a PR to implement https://github.com/apache/pulsar/issues/16691.
We need to support AntiAffinityGroupPolicy in Load Manager Extension as well.
### Modifications
This PR
- added AntiAffinityGroupPolicyFilter used in the broker assignment logic.
- added AntiAffinityGroupPolicyHelper that is passed to TransferShedder and AntiAffinityGroupPolicyFilter
- modified LoadManagerShared.filterAntiAffinityGroupOwnedBrokers and LoadManagerShared.getAntiAffinityNamespaceOwnedBrokers to accept the bundle ownership data from the Load Manager Extension.
- moved ModularLoadManagerImpl.refreshBrokerToFailureDomainMap(..) to LoadManager.refreshBrokerToFailureDomainMap(..) to reuse it in ExtensibleLoadManagerImpl.
- modified AntiAffinityNamespaceGroupTest to reuse the test cases in AntiAffinityNamespaceGroupExtensionTest
---
.../extensions/ExtensibleLoadManagerImpl.java | 12 +
.../channel/ServiceUnitStateChannel.java | 8 +
.../channel/ServiceUnitStateChannelImpl.java | 6 +
.../filter/AntiAffinityGroupPolicyFilter.java | 58 ++++
.../policies/AntiAffinityGroupPolicyHelper.java | 97 +++++++
.../extensions/scheduler/TransferShedder.java | 28 +-
.../broker/loadbalance/impl/LoadManagerShared.java | 179 +++++++++++-
.../loadbalance/impl/ModularLoadManagerImpl.java | 43 +--
.../AntiAffinityNamespaceGroupTest.java | 310 ++++++++++++---------
.../AntiAffinityNamespaceGroupExtensionTest.java | 196 +++++++++++++
.../extensions/scheduler/TransferShedderTest.java | 216 +++++++-------
11 files changed, 841 insertions(+), 312 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java
index c8ac8e46845..7895f06fd50 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/ExtensibleLoadManagerImpl.java
@@ -41,6 +41,7 @@ import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateC
import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLoadData;
import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLookupData;
import org.apache.pulsar.broker.loadbalance.extensions.data.TopBundlesLoadData;
+import org.apache.pulsar.broker.loadbalance.extensions.filter.AntiAffinityGroupPolicyFilter;
import org.apache.pulsar.broker.loadbalance.extensions.filter.BrokerFilter;
import org.apache.pulsar.broker.loadbalance.extensions.filter.BrokerIsolationPoliciesFilter;
import org.apache.pulsar.broker.loadbalance.extensions.filter.BrokerMaxTopicCountFilter;
@@ -52,6 +53,7 @@ import org.apache.pulsar.broker.loadbalance.extensions.models.SplitCounter;
import org.apache.pulsar.broker.loadbalance.extensions.models.Unload;
import org.apache.pulsar.broker.loadbalance.extensions.models.UnloadCounter;
import org.apache.pulsar.broker.loadbalance.extensions.models.UnloadDecision;
+import org.apache.pulsar.broker.loadbalance.extensions.policies.AntiAffinityGroupPolicyHelper;
import org.apache.pulsar.broker.loadbalance.extensions.reporter.BrokerLoadDataReporter;
import org.apache.pulsar.broker.loadbalance.extensions.reporter.TopBundleLoadDataReporter;
import org.apache.pulsar.broker.loadbalance.extensions.scheduler.LoadManagerScheduler;
@@ -91,6 +93,10 @@ public class ExtensibleLoadManagerImpl implements ExtensibleLoadManager {
private ServiceUnitStateChannel serviceUnitStateChannel;
+ private AntiAffinityGroupPolicyFilter antiAffinityGroupPolicyFilter;
+
+ private AntiAffinityGroupPolicyHelper antiAffinityGroupPolicyHelper;
+
private LoadDataStore<BrokerLoadData> brokerLoadDataStore;
private LoadDataStore<TopBundlesLoadData> topBundlesLoadDataStore;
@@ -137,6 +143,7 @@ public class ExtensibleLoadManagerImpl implements ExtensibleLoadManager {
CompletableFuture<Optional<BrokerLookupData>>>newBuilder()
.build();
+
/**
* Life cycle: Constructor -> initialize -> start -> close.
*/
@@ -173,6 +180,11 @@ public class ExtensibleLoadManagerImpl implements ExtensibleLoadManager {
this.serviceUnitStateChannel.listen(unloadManager);
this.serviceUnitStateChannel.listen(splitManager);
this.serviceUnitStateChannel.start();
+ this.antiAffinityGroupPolicyHelper =
+ new AntiAffinityGroupPolicyHelper(pulsar, serviceUnitStateChannel);
+ antiAffinityGroupPolicyHelper.listenFailureDomainUpdate();
+ this.antiAffinityGroupPolicyFilter = new AntiAffinityGroupPolicyFilter(antiAffinityGroupPolicyHelper);
+ this.brokerFilterPipeline.add(antiAffinityGroupPolicyFilter);
try {
this.brokerLoadDataStore = LoadDataStoreFactory
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannel.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannel.java
index dc4d582ddb0..4e92ad791ab 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannel.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannel.java
@@ -20,7 +20,9 @@ package org.apache.pulsar.broker.loadbalance.extensions.channel;
import java.io.Closeable;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.loadbalance.extensions.manager.StateChangeListener;
@@ -164,4 +166,10 @@ public interface ServiceUnitStateChannel extends Closeable {
*/
void listen(StateChangeListener listener);
+ /**
+ * Returns service unit ownership entry set.
+ * @return a set of service unit ownership entries
+ */
+ Set<Map.Entry<String, ServiceUnitStateData>> getOwnershipEntrySet();
+
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
index 5f24e41dda9..f8686c07f05 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/channel/ServiceUnitStateChannelImpl.java
@@ -1317,5 +1317,11 @@ public class ServiceUnitStateChannelImpl implements ServiceUnitStateChannel {
@Override
public void listen(StateChangeListener listener) {
this.stateChangeListeners.addListener(listener);
+
+ }
+
+ @Override
+ public Set<Map.Entry<String, ServiceUnitStateData>> getOwnershipEntrySet() {
+ return tableview.entrySet();
}
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/AntiAffinityGroupPolicyFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/AntiAffinityGroupPolicyFilter.java
new file mode 100644
index 00000000000..358f985f83e
--- /dev/null
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/filter/AntiAffinityGroupPolicyFilter.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.loadbalance.extensions.filter;
+
+import java.util.Map;
+import org.apache.pulsar.broker.PulsarService;
+import org.apache.pulsar.broker.loadbalance.extensions.LoadManagerContext;
+import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLookupData;
+import org.apache.pulsar.broker.loadbalance.extensions.policies.AntiAffinityGroupPolicyHelper;
+import org.apache.pulsar.common.naming.ServiceUnitId;
+
+/**
+ * Filter by anti-affinity-group-policy.
+ */
+public class AntiAffinityGroupPolicyFilter implements BrokerFilter {
+
+ public static final String FILTER_NAME = "broker_anti_affinity_group_filter";
+
+ private final AntiAffinityGroupPolicyHelper helper;
+
+ public AntiAffinityGroupPolicyFilter(AntiAffinityGroupPolicyHelper helper) {
+ this.helper = helper;
+ }
+
+ @Override
+ public Map<String, BrokerLookupData> filter(
+ Map<String, BrokerLookupData> brokers, ServiceUnitId serviceUnitId, LoadManagerContext context) {
+ helper.filter(brokers, serviceUnitId.toString());
+ return brokers;
+ }
+
+
+ @Override
+ public String name() {
+ return FILTER_NAME;
+ }
+
+ @Override
+ public void initialize(PulsarService pulsar) {
+ return;
+ }
+}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/policies/AntiAffinityGroupPolicyHelper.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/policies/AntiAffinityGroupPolicyHelper.java
new file mode 100644
index 00000000000..28acf5fba0e
--- /dev/null
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/policies/AntiAffinityGroupPolicyHelper.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.loadbalance.extensions.policies;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.broker.PulsarService;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateChannel;
+import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLookupData;
+import org.apache.pulsar.broker.loadbalance.impl.LoadManagerShared;
+import org.apache.pulsar.metadata.api.MetadataStoreException;
+
+@Slf4j
+public class AntiAffinityGroupPolicyHelper {
+ PulsarService pulsar;
+ Map<String, String> brokerToFailureDomainMap;
+ ServiceUnitStateChannel channel;
+
+ public AntiAffinityGroupPolicyHelper(PulsarService pulsar,
+ ServiceUnitStateChannel channel){
+
+ this.pulsar = pulsar;
+ this.brokerToFailureDomainMap = new HashMap<>();
+ this.channel = channel;
+ }
+
+ public void filter(
+ Map<String, BrokerLookupData> brokers, String bundle) {
+ LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar, bundle,
+ brokers.keySet(),
+ channel.getOwnershipEntrySet(), brokerToFailureDomainMap);
+ }
+
+ public boolean canUnload(
+ Map<String, BrokerLookupData> brokers,
+ String bundle,
+ String srcBroker,
+ Optional<String> dstBroker) {
+
+
+
+ try {
+ var antiAffinityGroupOptional = LoadManagerShared.getNamespaceAntiAffinityGroup(
+ pulsar, LoadManagerShared.getNamespaceNameFromBundleName(bundle));
+ if (antiAffinityGroupOptional.isPresent()) {
+
+ // copy to retain the input brokers
+ Map<String, BrokerLookupData> candidates = new HashMap<>(brokers);
+
+ filter(candidates, bundle);
+
+ candidates.remove(srcBroker);
+
+ // unload case
+ if (dstBroker.isEmpty()) {
+ return !candidates.isEmpty();
+ }
+
+ // transfer case
+ return candidates.containsKey(dstBroker.get());
+ }
+ } catch (MetadataStoreException e) {
+ log.error("Failed to check unload candidates. Assumes that bundle:{} cannot unload ", bundle, e);
+ return false;
+ }
+
+ return true;
+ }
+
+ public void listenFailureDomainUpdate() {
+ LoadManagerShared.refreshBrokerToFailureDomainMap(pulsar, brokerToFailureDomainMap);
+ // register listeners for domain changes
+ pulsar.getPulsarResources().getClusterResources().getFailureDomainResources()
+ .registerListener(__ -> {
+ pulsar.getLoadManagerExecutor().execute(() ->
+ LoadManagerShared.refreshBrokerToFailureDomainMap(pulsar, brokerToFailureDomainMap));
+ });
+ }
+}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedder.java
index 810fda320af..9f9582df2cc 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedder.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedder.java
@@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import lombok.Getter;
import lombok.experimental.Accessors;
-import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.loadbalance.extensions.LoadManagerContext;
@@ -41,13 +40,12 @@ import org.apache.pulsar.broker.loadbalance.extensions.data.BrokerLookupData;
import org.apache.pulsar.broker.loadbalance.extensions.data.TopBundlesLoadData;
import org.apache.pulsar.broker.loadbalance.extensions.models.Unload;
import org.apache.pulsar.broker.loadbalance.extensions.models.UnloadDecision;
+import org.apache.pulsar.broker.loadbalance.extensions.policies.AntiAffinityGroupPolicyHelper;
import org.apache.pulsar.broker.loadbalance.extensions.policies.IsolationPoliciesHelper;
import org.apache.pulsar.broker.loadbalance.extensions.store.LoadDataStore;
import org.apache.pulsar.broker.loadbalance.impl.LoadManagerShared;
import org.apache.pulsar.broker.loadbalance.impl.SimpleResourceAllocationPolicies;
import org.apache.pulsar.common.naming.NamespaceBundle;
-import org.apache.pulsar.common.naming.NamespaceName;
-import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,6 +78,7 @@ public class TransferShedder implements NamespaceUnloadStrategy {
private final PulsarService pulsar;
private final SimpleResourceAllocationPolicies allocationPolicies;
private final IsolationPoliciesHelper isolationPoliciesHelper;
+ private final AntiAffinityGroupPolicyHelper antiAffinityGroupPolicyHelper;
private final UnloadDecision decision = new UnloadDecision();
@@ -88,12 +87,14 @@ public class TransferShedder implements NamespaceUnloadStrategy {
this.pulsar = null;
this.allocationPolicies = null;
this.isolationPoliciesHelper = null;
+ this.antiAffinityGroupPolicyHelper = null;
}
- public TransferShedder(PulsarService pulsar){
+ public TransferShedder(PulsarService pulsar, AntiAffinityGroupPolicyHelper antiAffinityGroupPolicyHelper) {
this.pulsar = pulsar;
this.allocationPolicies = new SimpleResourceAllocationPolicies(pulsar);
this.isolationPoliciesHelper = new IsolationPoliciesHelper(allocationPolicies);
+ this.antiAffinityGroupPolicyHelper = antiAffinityGroupPolicyHelper;
}
@@ -438,32 +439,25 @@ public class TransferShedder implements NamespaceUnloadStrategy {
private boolean isTransferable(LoadManagerContext context,
Map<String, BrokerLookupData> availableBrokers,
String bundle,
- String maxBroker,
- Optional<String> broker) {
+ String srcBroker,
+ Optional<String> dstBroker) {
if (pulsar == null || allocationPolicies == null) {
return true;
}
String namespace = LoadManagerShared.getNamespaceNameFromBundleName(bundle);
- NamespaceName namespaceName = NamespaceName.get(namespace);
final String bundleRange = LoadManagerShared.getBundleRangeFromBundleName(bundle);
NamespaceBundle namespaceBundle =
pulsar.getNamespaceService().getNamespaceBundleFactory().getBundle(namespace, bundleRange);
- if (!canTransferWithIsolationPoliciesToBroker(context, availableBrokers, namespaceBundle, maxBroker, broker)) {
+ if (!canTransferWithIsolationPoliciesToBroker(
+ context, availableBrokers, namespaceBundle, srcBroker, dstBroker)) {
return false;
}
- try {
- var localPoliciesOptional = pulsar
- .getPulsarResources().getLocalPolicies().getLocalPolicies(namespaceName);
- if (localPoliciesOptional.isPresent() && StringUtils.isNotBlank(
- localPoliciesOptional.get().namespaceAntiAffinityGroup)) {
- return false;
- }
- } catch (MetadataStoreException e) {
- log.error("Failed to get localPolicies. Assumes that bundle:{} is not transferable.", bundle, e);
+ if (!antiAffinityGroupPolicyHelper.canUnload(availableBrokers, bundle, srcBroker, dstBroker)) {
return false;
}
+
return true;
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java
index 2c90b8a4047..6818ae03b52 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LoadManagerShared.java
@@ -29,6 +29,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
@@ -38,13 +39,18 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.loadbalance.BrokerHostUsage;
import org.apache.pulsar.broker.loadbalance.LoadData;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateData;
+import org.apache.pulsar.broker.resources.ClusterResources;
import org.apache.pulsar.common.naming.NamespaceBundle;
import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.naming.ServiceUnitId;
+import org.apache.pulsar.common.policies.data.FailureDomainImpl;
import org.apache.pulsar.common.util.DirectMemoryUtils;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap;
import org.apache.pulsar.common.util.collections.ConcurrentOpenHashSet;
+import org.apache.pulsar.metadata.api.MetadataStoreException;
import org.apache.pulsar.policies.data.loadbalancer.BrokerData;
import org.apache.pulsar.policies.data.loadbalancer.ResourceUsage;
import org.apache.pulsar.policies.data.loadbalancer.SystemResourceUsage;
@@ -329,6 +335,18 @@ public class LoadManagerShared {
try {
final Map<String, Integer> brokerToAntiAffinityNamespaceCount = getAntiAffinityNamespaceOwnedBrokers(pulsar,
namespaceName, brokerToNamespaceToBundleRange).get(30, TimeUnit.SECONDS);
+ filterAntiAffinityGroupOwnedBrokers(pulsar, candidates, brokerToDomainMap,
+ brokerToAntiAffinityNamespaceCount);
+ } catch (Exception e) {
+ LOG.error("Failed to filter anti-affinity group namespace {}", e.getMessage());
+ }
+ }
+
+ private static void filterAntiAffinityGroupOwnedBrokers(
+ final PulsarService pulsar,
+ final Set<String> candidates,
+ Map<String, String> brokerToDomainMap,
+ Map<String, Integer> brokerToAntiAffinityNamespaceCount) {
if (brokerToAntiAffinityNamespaceCount == null) {
// none of the broker owns anti-affinity-namespace so, none of the broker will be filtered
return;
@@ -368,6 +386,23 @@ public class LoadManagerShared {
candidates
.removeIf(broker -> brokerToAntiAffinityNamespaceCount.get(broker) != finalLeastNamespaceCount);
}
+ }
+
+ public static void filterAntiAffinityGroupOwnedBrokers(
+ final PulsarService pulsar, final String assignedBundleName,
+ final Set<String> candidates,
+ Set<Map.Entry<String, ServiceUnitStateData>> bundleOwnershipData,
+ Map<String, String> brokerToDomainMap) {
+ if (candidates.isEmpty()) {
+ return;
+ }
+ final String namespaceName = getNamespaceNameFromBundleName(assignedBundleName);
+ try {
+ final Map<String, Integer> brokerToAntiAffinityNamespaceCount = getAntiAffinityNamespaceOwnedBrokers(
+ pulsar, namespaceName, bundleOwnershipData)
+ .get(30, TimeUnit.SECONDS);
+ filterAntiAffinityGroupOwnedBrokers(pulsar, candidates, brokerToDomainMap,
+ brokerToAntiAffinityNamespaceCount);
} catch (Exception e) {
LOG.error("Failed to filter anti-affinity group namespace {}", e.getMessage());
}
@@ -424,14 +459,13 @@ public class LoadManagerShared {
brokerToNamespaceToBundleRange) {
CompletableFuture<Map<String, Integer>> antiAffinityNsBrokersResult = new CompletableFuture<>();
-
- pulsar.getPulsarResources().getLocalPolicies().getLocalPoliciesAsync(NamespaceName.get(namespaceName))
- .thenAccept(policies -> {
- if (!policies.isPresent() || StringUtils.isBlank(policies.get().namespaceAntiAffinityGroup)) {
+ getNamespaceAntiAffinityGroupAsync(pulsar, namespaceName)
+ .thenAccept(antiAffinityGroupOptional -> {
+ if (antiAffinityGroupOptional.isEmpty()) {
antiAffinityNsBrokersResult.complete(null);
return;
}
- final String antiAffinityGroup = policies.get().namespaceAntiAffinityGroup;
+ final String antiAffinityGroup = antiAffinityGroupOptional.get();
final Map<String, Integer> brokerToAntiAffinityNamespaceCount = new ConcurrentHashMap<>();
final List<CompletableFuture<Void>> futures = new ArrayList<>();
brokerToNamespaceToBundleRange.forEach((broker, nsToBundleRange) -> {
@@ -442,11 +476,27 @@ public class LoadManagerShared {
CompletableFuture<Void> future = new CompletableFuture<>();
futures.add(future);
+ countAntiAffinityNamespaceOwnedBrokers(broker, ns, future,
+ pulsar, antiAffinityGroup, brokerToAntiAffinityNamespaceCount);
+ });
+ });
+ FutureUtil.waitForAll(futures)
+ .thenAccept(r -> antiAffinityNsBrokersResult.complete(brokerToAntiAffinityNamespaceCount));
+ }).exceptionally(ex -> {
+ // namespace-policies has not been created yet
+ antiAffinityNsBrokersResult.complete(null);
+ return null;
+ });
+ return antiAffinityNsBrokersResult;
+ }
- pulsar.getPulsarResources().getLocalPolicies().getLocalPoliciesAsync(NamespaceName.get(ns))
- .thenAccept(nsPolicies -> {
- if (nsPolicies.isPresent()
- && antiAffinityGroup.equalsIgnoreCase(nsPolicies.get().namespaceAntiAffinityGroup)) {
+ private static void countAntiAffinityNamespaceOwnedBrokers(
+ String broker, String ns, CompletableFuture<Void> future, PulsarService pulsar,
+ String targetAntiAffinityGroup, Map<String, Integer> brokerToAntiAffinityNamespaceCount) {
+ getNamespaceAntiAffinityGroupAsync(pulsar, ns)
+ .thenAccept(antiAffinityGroupOptional -> {
+ if (antiAffinityGroupOptional.isPresent()
+ && targetAntiAffinityGroup.equalsIgnoreCase(antiAffinityGroupOptional.get())) {
brokerToAntiAffinityNamespaceCount.compute(broker,
(brokerName, count) -> count == null ? 1 : count + 1);
}
@@ -455,8 +505,39 @@ public class LoadManagerShared {
future.complete(null);
return null;
});
- });
- });
+ }
+
+ public static CompletableFuture<Map<String, Integer>> getAntiAffinityNamespaceOwnedBrokers(
+ final PulsarService pulsar, final String namespaceName,
+ Set<Map.Entry<String, ServiceUnitStateData>> bundleOwnershipData) {
+
+ CompletableFuture<Map<String, Integer>> antiAffinityNsBrokersResult = new CompletableFuture<>();
+ getNamespaceAntiAffinityGroupAsync(pulsar, namespaceName)
+ .thenAccept(antiAffinityGroupOptional -> {
+ if (antiAffinityGroupOptional.isEmpty()) {
+ antiAffinityNsBrokersResult.complete(null);
+ return;
+ }
+ final String antiAffinityGroup = antiAffinityGroupOptional.get();
+ final Map<String, Integer> brokerToAntiAffinityNamespaceCount = new ConcurrentHashMap<>();
+ final List<CompletableFuture<Void>> futures = new ArrayList<>();
+
+ bundleOwnershipData
+ .forEach(etr -> {
+ var stateData = etr.getValue();
+ var bundle = etr.getKey();
+ if (stateData.state() == ServiceUnitState.Owned
+ && StringUtils.isNotBlank(stateData.dstBroker())) {
+ CompletableFuture<Void> future = new CompletableFuture<>();
+ futures.add(future);
+ countAntiAffinityNamespaceOwnedBrokers
+ (stateData.dstBroker(),
+ LoadManagerShared.getNamespaceNameFromBundleName(bundle),
+ future, pulsar,
+ antiAffinityGroup, brokerToAntiAffinityNamespaceCount);
+ }
+ });
+
FutureUtil.waitForAll(futures)
.thenAccept(r -> antiAffinityNsBrokersResult.complete(brokerToAntiAffinityNamespaceCount));
}).exceptionally(ex -> {
@@ -467,6 +548,31 @@ public class LoadManagerShared {
return antiAffinityNsBrokersResult;
}
+ public static CompletableFuture<Optional<String>> getNamespaceAntiAffinityGroupAsync(
+ PulsarService pulsar, String namespaceName) {
+ return pulsar.getPulsarResources().getLocalPolicies().getLocalPoliciesAsync(NamespaceName.get(namespaceName))
+ .thenApply(localPoliciesOptional -> {
+ if (localPoliciesOptional.isPresent()
+ && StringUtils.isNotBlank(localPoliciesOptional.get().namespaceAntiAffinityGroup)) {
+ return Optional.of(localPoliciesOptional.get().namespaceAntiAffinityGroup);
+ }
+ return Optional.empty();
+ });
+ }
+
+
+ public static Optional<String> getNamespaceAntiAffinityGroup(
+ PulsarService pulsar, String namespaceName) throws MetadataStoreException {
+ var localPoliciesOptional =
+ pulsar.getPulsarResources().getLocalPolicies().getLocalPolicies(NamespaceName.get(namespaceName));
+ if (localPoliciesOptional.isPresent()
+ && StringUtils.isNotBlank(localPoliciesOptional.get().namespaceAntiAffinityGroup)) {
+ return Optional.of(localPoliciesOptional.get().namespaceAntiAffinityGroup);
+ }
+ return Optional.empty();
+ }
+
+
/**
*
* It checks if given anti-affinity namespace should be unloaded by broker due to load-shedding. If all the brokers
@@ -492,6 +598,13 @@ public class LoadManagerShared {
Map<String, Integer> brokerNamespaceCount = getAntiAffinityNamespaceOwnedBrokers(pulsar, namespace,
brokerToNamespaceToBundleRange).get(10, TimeUnit.SECONDS);
+ return shouldAntiAffinityNamespaceUnload(currentBroker, candidateBrokers, brokerNamespaceCount);
+ }
+
+ private static boolean shouldAntiAffinityNamespaceUnload(
+ String currentBroker,
+ Set<String> candidateBrokers,
+ Map<String, Integer> brokerNamespaceCount) {
if (brokerNamespaceCount != null && !brokerNamespaceCount.isEmpty()) {
int leastNsCount = Integer.MAX_VALUE;
int currentBrokerNsCount = 0;
@@ -522,6 +635,18 @@ public class LoadManagerShared {
return true;
}
+ public static boolean shouldAntiAffinityNamespaceUnload(
+ String namespace, String bundle, String currentBroker,
+ final PulsarService pulsar,
+ Set<Map.Entry<String, ServiceUnitStateData>> bundleOwnershipData,
+ Set<String> candidateBrokers) throws Exception {
+
+ Map<String, Integer> brokerNamespaceCount = getAntiAffinityNamespaceOwnedBrokers(
+ pulsar, namespace, bundleOwnershipData)
+ .get(10, TimeUnit.SECONDS);
+ return shouldAntiAffinityNamespaceUnload(currentBroker, candidateBrokers, brokerNamespaceCount);
+ }
+
public interface BrokerTopicLoadingPredicate {
boolean isEnablePersistentTopics(String brokerUrl);
@@ -554,4 +679,36 @@ public class LoadManagerShared {
brokerCandidateCache.addAll(filteredBrokerCandidates);
}
}
+
+ public static void refreshBrokerToFailureDomainMap(PulsarService pulsar,
+ Map<String, String> brokerToFailureDomainMap) {
+ if (!pulsar.getConfiguration().isFailureDomainsEnabled()) {
+ return;
+ }
+ ClusterResources.FailureDomainResources fdr =
+ pulsar.getPulsarResources().getClusterResources().getFailureDomainResources();
+ String clusterName = pulsar.getConfiguration().getClusterName();
+ try {
+ synchronized (brokerToFailureDomainMap) {
+ Map<String, String> tempBrokerToFailureDomainMap = new HashMap<>();
+ for (String domainName : fdr.listFailureDomains(clusterName)) {
+ try {
+ Optional<FailureDomainImpl> domain = fdr.getFailureDomain(clusterName, domainName);
+ if (domain.isPresent()) {
+ for (String broker : domain.get().brokers) {
+ tempBrokerToFailureDomainMap.put(broker, domainName);
+ }
+ }
+ } catch (Exception e) {
+ LOG.warn("Failed to get domain {}", domainName, e);
+ }
+ }
+ brokerToFailureDomainMap.clear();
+ brokerToFailureDomainMap.putAll(tempBrokerToFailureDomainMap);
+ }
+ LOG.info("Cluster domain refreshed {}", brokerToFailureDomainMap);
+ } catch (Exception e) {
+ LOG.warn("Failed to get domain-list for cluster {}", e.getMessage());
+ }
+ }
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
index 59f9836b309..f135840d60e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
@@ -57,7 +57,6 @@ import org.apache.pulsar.broker.loadbalance.LoadSheddingStrategy;
import org.apache.pulsar.broker.loadbalance.ModularLoadManager;
import org.apache.pulsar.broker.loadbalance.ModularLoadManagerStrategy;
import org.apache.pulsar.broker.loadbalance.impl.LoadManagerShared.BrokerTopicLoadingPredicate;
-import org.apache.pulsar.broker.resources.ClusterResources;
import org.apache.pulsar.broker.stats.prometheus.metrics.Summary;
import org.apache.pulsar.client.admin.PulsarAdminException;
import org.apache.pulsar.client.util.ExecutorProvider;
@@ -65,8 +64,6 @@ import org.apache.pulsar.common.naming.NamespaceBundle;
import org.apache.pulsar.common.naming.NamespaceBundleFactory;
import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.naming.ServiceUnitId;
-import org.apache.pulsar.common.policies.data.FailureDomainImpl;
-import org.apache.pulsar.common.policies.data.LocalPolicies;
import org.apache.pulsar.common.policies.data.ResourceQuota;
import org.apache.pulsar.common.stats.Metrics;
import org.apache.pulsar.common.util.FutureUtil;
@@ -272,11 +269,12 @@ public class ModularLoadManagerImpl implements ModularLoadManager {
policies = new SimpleResourceAllocationPolicies(pulsar);
filterPipeline.add(new BrokerVersionFilter());
- refreshBrokerToFailureDomainMap();
+ LoadManagerShared.refreshBrokerToFailureDomainMap(pulsar, brokerToFailureDomainMap);
// register listeners for domain changes
pulsar.getPulsarResources().getClusterResources().getFailureDomainResources()
.registerListener(__ -> {
- executors.execute(() -> refreshBrokerToFailureDomainMap());
+ executors.execute(
+ () -> LoadManagerShared.refreshBrokerToFailureDomainMap(pulsar, brokerToFailureDomainMap));
});
loadSheddingPipeline.add(createLoadSheddingStrategy());
@@ -713,9 +711,8 @@ public class ModularLoadManagerImpl implements ModularLoadManager {
public boolean shouldAntiAffinityNamespaceUnload(String namespace, String bundle, String currentBroker) {
try {
- Optional<LocalPolicies> nsPolicies = pulsar.getPulsarResources().getLocalPolicies()
- .getLocalPolicies(NamespaceName.get(namespace));
- if (!nsPolicies.isPresent() || StringUtils.isBlank(nsPolicies.get().namespaceAntiAffinityGroup)) {
+ var antiAffinityGroupOptional = LoadManagerShared.getNamespaceAntiAffinityGroup(pulsar, namespace);
+ if (antiAffinityGroupOptional.isEmpty()) {
return true;
}
@@ -1159,36 +1156,6 @@ public class ModularLoadManagerImpl implements ModularLoadManager {
});
}
- private void refreshBrokerToFailureDomainMap() {
- if (!pulsar.getConfiguration().isFailureDomainsEnabled()) {
- return;
- }
- ClusterResources.FailureDomainResources fdr =
- pulsar.getPulsarResources().getClusterResources().getFailureDomainResources();
- String clusterName = pulsar.getConfiguration().getClusterName();
- try {
- synchronized (brokerToFailureDomainMap) {
- Map<String, String> tempBrokerToFailureDomainMap = new HashMap<>();
- for (String domainName : fdr.listFailureDomains(clusterName)) {
- try {
- Optional<FailureDomainImpl> domain = fdr.getFailureDomain(clusterName, domainName);
- if (domain.isPresent()) {
- for (String broker : domain.get().brokers) {
- tempBrokerToFailureDomainMap.put(broker, domainName);
- }
- }
- } catch (Exception e) {
- log.warn("Failed to get domain {}", domainName, e);
- }
- }
- this.brokerToFailureDomainMap = tempBrokerToFailureDomainMap;
- }
- log.info("Cluster domain refreshed {}", brokerToFailureDomainMap);
- } catch (Exception e) {
- log.warn("Failed to get domain-list for cluster {}", e.getMessage());
- }
- }
-
@Override
public LocalBrokerData getBrokerLocalData(String broker) {
String key = String.format("%s/%s", LoadManager.LOADBALANCE_BROKERS_ROOT, broker);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
index 869fee487ab..560cfa9216a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
@@ -27,25 +27,25 @@ import com.google.common.collect.Range;
import com.google.common.collect.Sets;
import com.google.common.hash.Hashing;
import java.lang.reflect.Field;
-import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import lombok.Cleanup;
-import org.apache.bookkeeper.util.ZkUtils;
+import org.apache.commons.lang.reflect.FieldUtils;
import org.apache.pulsar.broker.PulsarService;
import org.apache.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateData;
import org.apache.pulsar.broker.loadbalance.impl.LoadManagerShared;
import org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl;
import org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerWrapper;
+import org.apache.pulsar.broker.resources.NamespaceResources;
+import org.apache.pulsar.broker.resources.PulsarResources;
+import org.apache.pulsar.broker.resources.TenantResources;
+import org.apache.pulsar.broker.testcontext.PulsarTestContext;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.PulsarClient;
@@ -54,42 +54,33 @@ import org.apache.pulsar.common.naming.NamespaceBundleFactory;
import org.apache.pulsar.common.naming.NamespaceBundles;
import org.apache.pulsar.common.naming.NamespaceName;
import org.apache.pulsar.common.naming.ServiceUnitId;
-import org.apache.pulsar.common.policies.data.ClusterData;
import org.apache.pulsar.common.policies.data.FailureDomain;
+import org.apache.pulsar.common.policies.data.Policies;
+import org.apache.pulsar.common.policies.data.TenantInfo;
import org.apache.pulsar.common.policies.data.TenantInfoImpl;
-import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap;
import org.apache.pulsar.common.util.collections.ConcurrentOpenHashSet;
-import org.apache.pulsar.zookeeper.LocalBookkeeperEnsemble;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.ZooKeeper;
+import org.apache.pulsar.metadata.api.extended.MetadataStoreExtended;
import org.awaitility.Awaitility;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@Test(groups = "broker")
-public class AntiAffinityNamespaceGroupTest {
- private LocalBookkeeperEnsemble bkEnsemble;
+public class AntiAffinityNamespaceGroupTest extends MockedPulsarServiceBaseTest {
- private URL url1;
+ private PulsarTestContext additionalPulsarTestContext;
private PulsarService pulsar1;
private PulsarAdmin admin1;
-
- private URL url2;
private PulsarService pulsar2;
- private PulsarAdmin admin2;
-
- private String primaryHost;
- private String secondaryHost;
-
+ protected String primaryHost;
+ protected String secondaryHost;
private NamespaceBundleFactory nsFactory;
+ protected Object primaryLoadManager;
+ private Object secondaryLoadManager;
- private ModularLoadManagerImpl primaryLoadManager;
- private ModularLoadManagerImpl secondaryLoadManager;
- private ExecutorService executor;
+ private PulsarResources resources;
private static Object getField(final Object instance, final String fieldName) throws Exception {
final Field field = instance.getClass().getDeclaredField(fieldName);
@@ -97,87 +88,94 @@ public class AntiAffinityNamespaceGroupTest {
return field.get(instance);
}
- @BeforeMethod
- void setup() throws Exception {
- executor = new ThreadPoolExecutor(5, 20, 30, TimeUnit.SECONDS,
- new LinkedBlockingQueue<Runnable>());
- // Start local bookkeeper ensemble
- bkEnsemble = new LocalBookkeeperEnsemble(3, 0, () -> 0);
- bkEnsemble.start();
-
- // Start broker 1
- ServiceConfiguration config1 = new ServiceConfiguration();
- config1.setLoadManagerClassName(ModularLoadManagerImpl.class.getName());
- config1.setClusterName("use");
- config1.setWebServicePort(Optional.of(0));
- config1.setMetadataStoreUrl("zk:127.0.0.1:" + bkEnsemble.getZookeeperPort());
- config1.setBrokerShutdownTimeoutMs(0L);
- config1.setLoadBalancerOverrideBrokerNicSpeedGbps(Optional.of(1.0d));
- config1.setBrokerServicePort(Optional.of(0));
- config1.setFailureDomainsEnabled(true);
- config1.setLoadBalancerEnabled(true);
- config1.setAdvertisedAddress("localhost");
+ void setupConfigs(ServiceConfiguration conf){
+ conf.setAllowAutoTopicCreation(true);
+ conf.setLoadManagerClassName(getLoadManagerClassName());
+ conf.setFailureDomainsEnabled(true);
+ conf.setLoadBalancerEnabled(true);
// Don't want overloaded threshold to affect namespace placement
- config1.setLoadBalancerBrokerOverloadedThresholdPercentage(400);
- createCluster(bkEnsemble.getZkClient(), config1);
- pulsar1 = new PulsarService(config1);
- pulsar1.start();
+ conf.setLoadBalancerBrokerOverloadedThresholdPercentage(400);
+ }
+ @BeforeClass
+ @Override
+ public void setup() throws Exception {
+ setupConfigs(conf);
+ super.internalSetup(conf);
+ pulsar1 = pulsar;
primaryHost = String.format("%s:%d", "localhost", pulsar1.getListenPortHTTP().get());
- url1 = new URL("http://127.0.0.1" + ":" + pulsar1.getListenPortHTTP().get());
- admin1 = PulsarAdmin.builder().serviceHttpUrl(url1.toString()).build();
-
- // Start broker 2
- ServiceConfiguration config2 = new ServiceConfiguration();
- config2.setLoadManagerClassName(ModularLoadManagerImpl.class.getName());
- config2.setClusterName("use");
- config2.setWebServicePort(Optional.of(0));
- config2.setMetadataStoreUrl("zk:127.0.0.1:" + bkEnsemble.getZookeeperPort());
- config2.setBrokerShutdownTimeoutMs(0L);
- config2.setLoadBalancerOverrideBrokerNicSpeedGbps(Optional.of(1.0d));
- config2.setBrokerServicePort(Optional.of(0));
- config2.setFailureDomainsEnabled(true);
- config2.setAdvertisedAddress("localhost");
- // Don't want overloaded threshold to affect namespace placement
- config2.setLoadBalancerBrokerOverloadedThresholdPercentage(400);
- pulsar2 = new PulsarService(config2);
- pulsar2.start();
+ admin1 = admin;
+ var config2 = getDefaultConf();
+ setupConfigs(config2);
+ additionalPulsarTestContext = createAdditionalPulsarTestContext(config2);
+ pulsar2 = additionalPulsarTestContext.getPulsarService();
secondaryHost = String.format("%s:%d", "localhost", pulsar2.getListenPortHTTP().get());
- url2 = new URL("http://127.0.0.1" + ":" + config2.getWebServicePort().get());
- admin2 = PulsarAdmin.builder().serviceHttpUrl(url2.toString()).build();
-
- primaryLoadManager = (ModularLoadManagerImpl) getField(pulsar1.getLoadManager().get(), "loadManager");
- secondaryLoadManager = (ModularLoadManagerImpl) getField(pulsar2.getLoadManager().get(), "loadManager");
+ primaryLoadManager = getField(pulsar1.getLoadManager().get(), "loadManager");
+ secondaryLoadManager = getField(pulsar2.getLoadManager().get(), "loadManager");
nsFactory = new NamespaceBundleFactory(pulsar1, Hashing.crc32());
Awaitility.await().untilAsserted(() -> {
assertEquals(pulsar1.getState(), PulsarService.State.Started);
assertEquals(pulsar2.getState(), PulsarService.State.Started);
});
+
+ admin1.tenants().createTenant("my-tenant",
+ createDefaultTenantInfo());
+ }
+
+ @Override
+ @AfterClass
+ protected void cleanup() throws Exception {
+ pulsar1 = null;
+ pulsar2.close();
+ super.internalCleanup();
+ this.additionalPulsarTestContext.close();
+ }
+
+ protected void beforePulsarStart(PulsarService pulsar) throws Exception {
+ if (resources == null) {
+ MetadataStoreExtended localStore = pulsar.createLocalMetadataStore(null);
+ MetadataStoreExtended configStore = (MetadataStoreExtended) pulsar.createConfigurationMetadataStore(null);
+ resources = new PulsarResources(localStore, configStore);
+ }
+ this.createNamespaceIfNotExists(resources, NamespaceName.SYSTEM_NAMESPACE.getTenant(),
+ NamespaceName.SYSTEM_NAMESPACE);
}
- @AfterMethod(alwaysRun = true)
- void shutdown() throws Exception {
- executor.shutdownNow();
+ protected void createNamespaceIfNotExists(PulsarResources resources,
+ String publicTenant,
+ NamespaceName ns) throws Exception {
+ TenantResources tr = resources.getTenantResources();
+ NamespaceResources nsr = resources.getNamespaceResources();
+
+ if (!tr.tenantExists(publicTenant)) {
+ tr.createTenant(publicTenant,
+ TenantInfo.builder()
+ .adminRoles(Sets.newHashSet(conf.getSuperUserRoles()))
+ .allowedClusters(Sets.newHashSet(conf.getClusterName()))
+ .build());
+ }
- admin1.close();
- admin2.close();
+ if (!nsr.namespaceExists(ns)) {
+ Policies nsp = new Policies();
+ nsp.replication_clusters = Collections.singleton(conf.getClusterName());
+ nsr.createPolicies(ns, nsp);
+ }
+ }
- pulsar2.close();
- pulsar1.close();
- bkEnsemble.stop();
+ protected Object getBundleOwnershipData(){
+ return ConcurrentOpenHashMap.<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>newBuilder().build();
}
- private void createCluster(ZooKeeper zk, ServiceConfiguration config) throws Exception {
- ZkUtils.createFullPathOptimistic(zk, "/admin/clusters/" + config.getClusterName(),
- ObjectMapperFactory.getMapper().writer().writeValueAsBytes(
- ClusterData.builder().serviceUrl("http://" + config.getAdvertisedAddress() + ":" + config.getWebServicePort().get()).build()),
- Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+
+ protected String getLoadManagerClassName() {
+ return ModularLoadManagerImpl.class.getName();
}
+
@Test
public void testClusterDomain() {
@@ -209,15 +207,13 @@ public class AntiAffinityNamespaceGroupTest {
@Test
public void testAntiAffinityNamespaceFilteringWithDomain() throws Exception {
- final String namespace = "my-tenant/use/my-ns";
+ final String namespace = "my-tenant/test/my-ns";
final int totalNamespaces = 5;
final String namespaceAntiAffinityGroup = "my-antiaffinity";
final String bundle = "/0x00000000_0xffffffff";
final int totalBrokers = 4;
pulsar1.getConfiguration().setFailureDomainsEnabled(true);
- admin1.tenants().createTenant("my-tenant",
- new TenantInfoImpl(Sets.newHashSet("appid1", "appid2"), Sets.newHashSet("use")));
for (int i = 0; i < totalNamespaces; i++) {
final String ns = namespace + i;
@@ -237,8 +233,7 @@ public class AntiAffinityNamespaceGroupTest {
brokerToDomainMap.put("brokerName-3", "domain-1");
Set<String> candidate = new HashSet<>();
- ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>> brokerToNamespaceToBundleRange =
- ConcurrentOpenHashMap.<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>newBuilder().build();
+ Object brokerToNamespaceToBundleRange = getBundleOwnershipData();
assertEquals(brokers.size(), totalBrokers);
@@ -246,7 +241,7 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
// for namespace-0 all brokers available
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, brokers,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, brokers,
brokerToNamespaceToBundleRange, brokerToDomainMap);
assertEquals(brokers.size(), totalBrokers);
@@ -255,7 +250,7 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
// for namespace-1 only domain-1 brokers are available as broker-0 already owns namespace-0
assignedNamespace = namespace + "1" + bundle;
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
assertEquals(candidate.size(), 2);
candidate.forEach(broker -> assertEquals(brokerToDomainMap.get(broker), "domain-1"));
@@ -265,7 +260,7 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
// for namespace-2 only brokers available are : broker-1 and broker-3
assignedNamespace = namespace + "2" + bundle;
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
assertEquals(candidate.size(), 2);
assertTrue(candidate.contains("brokerName-1"));
@@ -276,7 +271,7 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
// for namespace-3 only brokers available are : broker-3
assignedNamespace = namespace + "3" + bundle;
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
assertEquals(candidate.size(), 1);
assertTrue(candidate.contains("brokerName-3"));
@@ -285,7 +280,7 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
// for namespace-4 only brokers available are : all 4 brokers
assignedNamespace = namespace + "4" + bundle;
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, brokerToDomainMap);
assertEquals(candidate.size(), 4);
}
@@ -308,14 +303,11 @@ public class AntiAffinityNamespaceGroupTest {
@Test
public void testAntiAffinityNamespaceFilteringWithoutDomain() throws Exception {
- final String namespace = "my-tenant/use/my-ns";
+ final String namespace = "my-tenant/test/my-ns-wo-domain";
final int totalNamespaces = 5;
- final String namespaceAntiAffinityGroup = "my-antiaffinity";
+ final String namespaceAntiAffinityGroup = "my-antiaffinity-wo-domain";
final String bundle = "/0x00000000_0xffffffff";
- admin1.tenants().createTenant("my-tenant",
- new TenantInfoImpl(Sets.newHashSet("appid1", "appid2"), Sets.newHashSet("use")));
-
for (int i = 0; i < totalNamespaces; i++) {
final String ns = namespace + i;
admin1.namespaces().createNamespace(ns);
@@ -324,8 +316,7 @@ public class AntiAffinityNamespaceGroupTest {
Set<String> brokers = new HashSet<>();
Set<String> candidate = new HashSet<>();
- ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>> brokerToNamespaceToBundleRange =
- ConcurrentOpenHashMap.<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>newBuilder().build();
+ Object brokerToNamespaceToBundleRange = getBundleOwnershipData();
brokers.add("broker-0");
brokers.add("broker-1");
brokers.add("broker-2");
@@ -334,7 +325,7 @@ public class AntiAffinityNamespaceGroupTest {
// all brokers available so, candidate will be all 3 brokers
candidate.addAll(brokers);
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, brokers,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, brokers,
brokerToNamespaceToBundleRange, null);
assertEquals(brokers.size(), 3);
@@ -343,7 +334,7 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
assignedNamespace = namespace + "1" + bundle;
// available brokers for ns-1 => broker-1, broker-2
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, null);
assertEquals(candidate.size(), 2);
assertTrue(candidate.contains("broker-1"));
@@ -354,7 +345,7 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
// available brokers for ns-2 => broker-2
assignedNamespace = namespace + "2" + bundle;
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, null);
assertEquals(candidate.size(), 1);
assertTrue(candidate.contains("broker-2"));
@@ -364,14 +355,19 @@ public class AntiAffinityNamespaceGroupTest {
candidate.addAll(brokers);
// available brokers for ns-3 => broker-0, broker-1, broker-2
assignedNamespace = namespace + "3" + bundle;
- LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
+ filterAntiAffinityGroupOwnedBrokers(pulsar1, assignedNamespace, candidate,
brokerToNamespaceToBundleRange, null);
assertEquals(candidate.size(), 3);
}
- private void selectBrokerForNamespace(
- ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>> brokerToNamespaceToBundleRange,
+ protected void selectBrokerForNamespace(
+ Object ownershipData,
String broker, String namespace, String assignedBundleName) {
+
+ ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>
+ brokerToNamespaceToBundleRange =
+ (ConcurrentOpenHashMap<String,
+ ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>) ownershipData;
ConcurrentOpenHashSet<String> bundleSet =
ConcurrentOpenHashSet.<String>newBuilder().build();
bundleSet.add(assignedBundleName);
@@ -436,15 +432,19 @@ public class AntiAffinityNamespaceGroupTest {
});
ServiceUnitId serviceUnit1 = makeBundle(tenant, cluster, "ns1");
- String selectedBroker1 = primaryLoadManager.selectBrokerForAssignment(serviceUnit1).get();
+ String selectedBroker1 = selectBroker(serviceUnit1, primaryLoadManager);
ServiceUnitId serviceUnit2 = makeBundle(tenant, cluster, "ns2");
- String selectedBroker2 = primaryLoadManager.selectBrokerForAssignment(serviceUnit2).get();
+ String selectedBroker2 = selectBroker(serviceUnit2, primaryLoadManager);
assertNotEquals(selectedBroker1, selectedBroker2);
}
+ protected String selectBroker(ServiceUnitId serviceUnit, Object loadManager) {
+ return ((ModularLoadManager) loadManager).selectBrokerForAssignment(serviceUnit).get();
+ }
+
/**
* It verifies that load-shedding task should unload namespace only if there is a broker available which doesn't
* cause uneven anti-affinity namespace distribution.
@@ -460,14 +460,11 @@ public class AntiAffinityNamespaceGroupTest {
@Test
public void testLoadSheddingUtilWithAntiAffinityNamespace() throws Exception {
- final String namespace = "my-tenant/use/my-ns";
+ final String namespace = "my-tenant/test/my-ns-load-shedding-util";
final int totalNamespaces = 5;
- final String namespaceAntiAffinityGroup = "my-antiaffinity";
+ final String namespaceAntiAffinityGroup = "my-antiaffinity-load-shedding-util";
final String bundle = "/0x00000000_0xffffffff";
- admin1.tenants().createTenant("my-tenant",
- new TenantInfoImpl(Sets.newHashSet("appid1", "appid2"), Sets.newHashSet("use")));
-
for (int i = 0; i < totalNamespaces; i++) {
final String ns = namespace + i;
admin1.namespaces().createNamespace(ns);
@@ -476,8 +473,7 @@ public class AntiAffinityNamespaceGroupTest {
Set<String> brokers = new HashSet<>();
Set<String> candidate = new HashSet<>();
- ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>> brokerToNamespaceToBundleRange =
- ConcurrentOpenHashMap.<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>newBuilder().build();
+ Object brokerToNamespaceToBundleRange = getBundleOwnershipData();
brokers.add("broker-0");
brokers.add("broker-1");
brokers.add("broker-2");
@@ -489,17 +485,17 @@ public class AntiAffinityNamespaceGroupTest {
// add ns-0 to broker-0
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "broker-0", namespace + "0", assignedNamespace);
String currentBroker = "broker-0";
- boolean shouldUnload = LoadManagerShared.shouldAntiAffinityNamespaceUnload(namespace + "0", bundle,
+ boolean shouldUnload = shouldAntiAffinityNamespaceUnload(namespace + "0", bundle,
currentBroker, pulsar1, brokerToNamespaceToBundleRange, candidate);
assertTrue(shouldUnload);
// add ns-1 to broker-1
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "broker-1", namespace + "1", assignedNamespace);
- shouldUnload = LoadManagerShared.shouldAntiAffinityNamespaceUnload(namespace + "0", bundle, currentBroker,
+ shouldUnload = shouldAntiAffinityNamespaceUnload(namespace + "0", bundle, currentBroker,
pulsar1, brokerToNamespaceToBundleRange, candidate);
assertTrue(shouldUnload);
// add ns-2 to broker-2
selectBrokerForNamespace(brokerToNamespaceToBundleRange, "broker-2", namespace + "2", assignedNamespace);
- shouldUnload = LoadManagerShared.shouldAntiAffinityNamespaceUnload(namespace + "0", bundle, currentBroker,
+ shouldUnload = shouldAntiAffinityNamespaceUnload(namespace + "0", bundle, currentBroker,
pulsar1, brokerToNamespaceToBundleRange, candidate);
assertFalse(shouldUnload);
@@ -514,14 +510,11 @@ public class AntiAffinityNamespaceGroupTest {
@Test
public void testLoadSheddingWithAntiAffinityNamespace() throws Exception {
- final String namespace = "my-tenant/use/my-ns";
+ final String namespace = "my-tenant/test/my-ns-load-shedding";
final int totalNamespaces = 5;
- final String namespaceAntiAffinityGroup = "my-antiaffinity";
+ final String namespaceAntiAffinityGroup = "my-antiaffinity-load-shedding";
final String bundle = "0x00000000_0xffffffff";
- admin1.tenants().createTenant("my-tenant",
- new TenantInfoImpl(Sets.newHashSet("appid1", "appid2"), Sets.newHashSet("use")));
-
for (int i = 0; i < totalNamespaces; i++) {
final String ns = namespace + i;
admin1.namespaces().createNamespace(ns);
@@ -532,22 +525,24 @@ public class AntiAffinityNamespaceGroupTest {
PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(pulsar1.getSafeWebServiceAddress()).build();
Producer<byte[]> producer = pulsarClient.newProducer().topic("persistent://" + namespace + "0/my-topic1")
.create();
+ pulsar1.getBrokerService().updateRates();
+ verifyLoadSheddingWithAntiAffinityNamespace(namespace + "0", bundle);
+ producer.close();
+ }
+
+ protected void verifyLoadSheddingWithAntiAffinityNamespace(String namespace, String bundle) {
+
ModularLoadManagerImpl loadManager = (ModularLoadManagerImpl) ((ModularLoadManagerWrapper) pulsar1
.getLoadManager().get()).getLoadManager();
-
- pulsar1.getBrokerService().updateRates();
loadManager.updateAll();
-
- assertTrue(loadManager.shouldAntiAffinityNamespaceUnload(namespace + "0", bundle, primaryHost));
- producer.close();
+ assertTrue(loadManager.shouldAntiAffinityNamespaceUnload(namespace, bundle, primaryHost));
}
- private boolean isLoadManagerUpdatedDomainCache(ModularLoadManagerImpl loadManager) throws Exception {
- Field mapField = ModularLoadManagerImpl.class.getDeclaredField("brokerToFailureDomainMap");
- mapField.setAccessible(true);
+ protected boolean isLoadManagerUpdatedDomainCache(Object loadManager) throws Exception {
@SuppressWarnings("unchecked")
- Map<String, String> map = (Map<String, String>) mapField.get(loadManager);
- return !map.isEmpty();
+ var brokerToFailureDomainMap = (Map<String, String>)
+ FieldUtils.readDeclaredField(loadManager, "brokerToFailureDomainMap", true);
+ return !brokerToFailureDomainMap.isEmpty();
}
private NamespaceBundle makeBundle(final String property, final String cluster, final String namespace) {
@@ -556,4 +551,43 @@ public class AntiAffinityNamespaceGroupTest {
BoundType.CLOSED));
}
+ private static void filterAntiAffinityGroupOwnedBrokers(
+ PulsarService pulsar,
+ String assignedNamespace,
+ Set<String> brokers,
+ Object ownershipData,
+ Map<String, String> brokerToDomainMap) {
+ if (ownershipData instanceof Set) {
+ LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar, assignedNamespace, brokers,
+ (Set<Map.Entry<String, ServiceUnitStateData>>) ownershipData, brokerToDomainMap);
+ } else if (ownershipData instanceof ConcurrentOpenHashMap) {
+ LoadManagerShared.filterAntiAffinityGroupOwnedBrokers(pulsar, assignedNamespace, brokers,
+ (ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>)
+ ownershipData, brokerToDomainMap);
+ } else {
+ throw new RuntimeException("Unknown ownershipData class type");
+ }
+ }
+
+ private static boolean shouldAntiAffinityNamespaceUnload(
+ String namespace,
+ String bundle,
+ String currentBroker,
+ PulsarService pulsar,
+ Object ownershipData,
+ Set<String> candidate) throws Exception {
+
+ if (ownershipData instanceof Set) {
+ return LoadManagerShared.shouldAntiAffinityNamespaceUnload(namespace, bundle,
+ currentBroker, pulsar, (Set<Map.Entry<String, ServiceUnitStateData>>) ownershipData, candidate);
+ } else if (ownershipData instanceof ConcurrentOpenHashMap) {
+ return LoadManagerShared.shouldAntiAffinityNamespaceUnload(namespace, bundle,
+ currentBroker, pulsar,
+ (ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>>)
+ ownershipData, candidate);
+ } else {
+ throw new RuntimeException("Unknown ownershipData class type");
+ }
+ }
+
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/AntiAffinityNamespaceGroupExtensionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/AntiAffinityNamespaceGroupExtensionTest.java
new file mode 100644
index 00000000000..32822c0f5b5
--- /dev/null
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/AntiAffinityNamespaceGroupExtensionTest.java
@@ -0,0 +1,196 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.loadbalance.extensions;
+
+import static org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitState.Owned;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import java.util.AbstractMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import lombok.Cleanup;
+import org.apache.pulsar.broker.loadbalance.AntiAffinityNamespaceGroupTest;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateChannel;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateData;
+import org.apache.pulsar.broker.loadbalance.extensions.filter.AntiAffinityGroupPolicyFilter;
+import org.apache.pulsar.broker.loadbalance.extensions.policies.AntiAffinityGroupPolicyHelper;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.common.naming.ServiceUnitId;
+import org.testcontainers.shaded.org.apache.commons.lang3.reflect.FieldUtils;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker")
+public class AntiAffinityNamespaceGroupExtensionTest extends AntiAffinityNamespaceGroupTest {
+
+ final String bundle = "0x00000000_0xffffffff";
+ final String nsSuffix = "-antiaffinity-enabled";
+
+ protected Object getBundleOwnershipData() {
+ return new HashSet<Map.Entry<String, ServiceUnitStateData>>();
+ }
+
+ protected String getLoadManagerClassName() {
+ return ExtensibleLoadManagerImpl.class.getName();
+ }
+
+ protected String selectBroker(ServiceUnitId serviceUnit, Object loadManager) {
+ try {
+ return ((ExtensibleLoadManagerImpl) loadManager).assign(Optional.empty(), serviceUnit).get()
+ .get().getPulsarServiceUrl();
+ } catch (Throwable e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected void selectBrokerForNamespace(
+ Object ownershipData,
+ String broker, String namespace, String assignedBundleName) {
+
+ Set<Map.Entry<String, ServiceUnitStateData>> ownershipDataSet =
+ (Set<Map.Entry<String, ServiceUnitStateData>>) ownershipData;
+ ownershipDataSet.add(
+ new AbstractMap.SimpleEntry<String, ServiceUnitStateData>(
+ assignedBundleName,
+ new ServiceUnitStateData(Owned, broker, 1)));
+
+ }
+
+ protected void verifyLoadSheddingWithAntiAffinityNamespace(String namespace, String bundle) {
+ try {
+ String namespaceBundle = namespace + "/" + bundle;
+ var antiAffinityGroupPolicyHelper =
+ (AntiAffinityGroupPolicyHelper)
+ FieldUtils.readDeclaredField(
+ primaryLoadManager, "antiAffinityGroupPolicyHelper", true);
+ var brokerRegistry =
+ (BrokerRegistry)
+ FieldUtils.readDeclaredField(
+ primaryLoadManager, "brokerRegistry", true);
+ var brokers = brokerRegistry
+ .getAvailableBrokerLookupDataAsync().get(5, TimeUnit.SECONDS);
+ var serviceUnitStateChannel = (ServiceUnitStateChannel)
+ FieldUtils.readDeclaredField(
+ primaryLoadManager, "serviceUnitStateChannel", true);
+ var srcBroker = serviceUnitStateChannel.getOwnerAsync(namespaceBundle)
+ .get(5, TimeUnit.SECONDS).get();
+ var brokersCopy = new HashMap<>(brokers);
+ brokersCopy.remove(srcBroker);
+ var dstBroker = brokersCopy.entrySet().iterator().next().getKey();
+
+ assertTrue(antiAffinityGroupPolicyHelper.canUnload(brokers,
+ "not-enabled-" + namespace + "/" + bundle,
+ srcBroker, Optional.of(dstBroker)));
+
+ assertTrue(antiAffinityGroupPolicyHelper.canUnload(brokers,
+ "not-enabled-" + namespace + "/" + bundle,
+ srcBroker, Optional.empty()));
+
+ assertTrue(antiAffinityGroupPolicyHelper.canUnload(brokers,
+ namespaceBundle,
+ srcBroker, Optional.of(dstBroker)));
+
+ assertFalse(antiAffinityGroupPolicyHelper.canUnload(brokers,
+ namespaceBundle,
+ dstBroker, Optional.of(srcBroker)));
+
+ assertTrue(antiAffinityGroupPolicyHelper.canUnload(brokers,
+ namespaceBundle,
+ srcBroker, Optional.empty()));
+
+ assertFalse(antiAffinityGroupPolicyHelper.canUnload(brokers,
+ namespaceBundle,
+ dstBroker, Optional.empty()));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected boolean isLoadManagerUpdatedDomainCache(Object loadManager) throws Exception {
+ @SuppressWarnings("unchecked")
+ var antiAffinityGroupPolicyHelper =
+ (AntiAffinityGroupPolicyHelper)
+ FieldUtils.readDeclaredField(
+ loadManager, "antiAffinityGroupPolicyHelper", true);
+ var brokerToFailureDomainMap = (Map<String, String>)
+ org.apache.commons.lang.reflect.FieldUtils.readDeclaredField(antiAffinityGroupPolicyHelper,
+ "brokerToFailureDomainMap", true);
+ return !brokerToFailureDomainMap.isEmpty();
+ }
+
+ @Test
+ public void testAntiAffinityGroupPolicyFilter()
+ throws IllegalAccessException, ExecutionException, InterruptedException,
+ TimeoutException, PulsarAdminException, PulsarClientException {
+
+ final String namespace = "my-tenant/test/my-ns-filter";
+ final String namespaceAntiAffinityGroup = "my-antiaffinity-filter";
+
+
+ final String antiAffinityEnabledNameSpace = namespace + nsSuffix;
+ admin.namespaces().createNamespace(antiAffinityEnabledNameSpace);
+ admin.namespaces().setNamespaceAntiAffinityGroup(antiAffinityEnabledNameSpace, namespaceAntiAffinityGroup);
+ PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(pulsar.getSafeWebServiceAddress()).build();
+ @Cleanup
+ Producer<byte[]> producer = pulsarClient.newProducer().topic(
+ "persistent://" + antiAffinityEnabledNameSpace + "/my-topic1")
+ .create();
+ pulsar.getBrokerService().updateRates();
+ var brokerRegistry =
+ (BrokerRegistry)
+ FieldUtils.readDeclaredField(
+ primaryLoadManager, "brokerRegistry", true);
+ var antiAffinityGroupPolicyFilter =
+ (AntiAffinityGroupPolicyFilter)
+ FieldUtils.readDeclaredField(
+ primaryLoadManager, "antiAffinityGroupPolicyFilter", true);
+ var context = ((ExtensibleLoadManagerImpl) primaryLoadManager).getContext();
+ var brokers = brokerRegistry
+ .getAvailableBrokerLookupDataAsync().get(5, TimeUnit.SECONDS);
+ ServiceUnitId namespaceBundle = mock(ServiceUnitId.class);
+ doReturn(namespace + "/" + bundle).when(namespaceBundle).toString();
+
+ var expected = new HashMap<>(brokers);
+ var actual = antiAffinityGroupPolicyFilter.filter(
+ brokers, namespaceBundle, context);
+ assertEquals(actual, expected);
+
+ doReturn(antiAffinityEnabledNameSpace + "/" + bundle).when(namespaceBundle).toString();
+ var serviceUnitStateChannel = (ServiceUnitStateChannel)
+ FieldUtils.readDeclaredField(
+ primaryLoadManager, "serviceUnitStateChannel", true);
+ var srcBroker = serviceUnitStateChannel.getOwnerAsync(namespaceBundle.toString())
+ .get(5, TimeUnit.SECONDS).get();
+ expected.remove(srcBroker);
+ actual = antiAffinityGroupPolicyFilter.filter(
+ brokers, namespaceBundle, context);
+ assertEquals(actual, expected);
+ }
+}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedderTest.java
index a668d85f007..47bf1ad2e7e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/extensions/scheduler/TransferShedderTest.java
@@ -40,6 +40,8 @@ import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+import com.google.common.collect.BoundType;
+import com.google.common.collect.Range;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
@@ -50,8 +52,6 @@ import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeoutException;
import java.util.function.BiConsumer;
-import com.google.common.collect.BoundType;
-import com.google.common.collect.Range;
import org.apache.commons.lang.reflect.FieldUtils;
import org.apache.commons.math3.stat.descriptive.moment.Mean;
import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation;
@@ -65,11 +65,13 @@ import org.apache.pulsar.broker.loadbalance.extensions.data.TopBundlesLoadData;
import org.apache.pulsar.broker.loadbalance.extensions.models.TopKBundles;
import org.apache.pulsar.broker.loadbalance.extensions.models.Unload;
import org.apache.pulsar.broker.loadbalance.extensions.models.UnloadDecision;
+import org.apache.pulsar.broker.loadbalance.extensions.policies.AntiAffinityGroupPolicyHelper;
import org.apache.pulsar.broker.loadbalance.extensions.policies.IsolationPoliciesHelper;
import org.apache.pulsar.broker.loadbalance.extensions.store.LoadDataStore;
import org.apache.pulsar.broker.loadbalance.impl.SimpleResourceAllocationPolicies;
import org.apache.pulsar.broker.namespace.NamespaceService;
import org.apache.pulsar.broker.resources.LocalPoliciesResources;
+import org.apache.pulsar.broker.resources.NamespaceResources;
import org.apache.pulsar.broker.resources.PulsarResources;
import org.apache.pulsar.common.naming.NamespaceBundle;
import org.apache.pulsar.common.naming.NamespaceBundleFactory;
@@ -82,6 +84,7 @@ import org.apache.pulsar.policies.data.loadbalancer.AdvertisedListener;
import org.apache.pulsar.policies.data.loadbalancer.NamespaceBundleStats;
import org.apache.pulsar.policies.data.loadbalancer.ResourceUsage;
import org.apache.pulsar.policies.data.loadbalancer.SystemResourceUsage;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -89,6 +92,49 @@ import org.testng.annotations.Test;
public class TransferShedderTest {
double setupLoadAvg = 0.36400000000000005;
double setupLoadStd = 0.3982762860126121;
+
+ PulsarService pulsar;
+ AntiAffinityGroupPolicyHelper antiAffinityGroupPolicyHelper;
+ ServiceConfiguration conf;
+ LocalPoliciesResources localPoliciesResources;
+ String bundleD1 = "my-tenant/my-namespaceD/0x00000000_0x0FFFFFFF";
+ String bundleD2 = "my-tenant/my-namespaceD/0x0FFFFFFF_0xFFFFFFFF";
+ String bundleE1 = "my-tenant/my-namespaceE/0x00000000_0x0FFFFFFF";
+ String bundleE2 = "my-tenant/my-namespaceE/0x0FFFFFFF_0xFFFFFFFF";
+
+ @BeforeMethod
+ public void init() throws MetadataStoreException {
+ pulsar = mock(PulsarService.class);
+ conf = new ServiceConfiguration();
+ doReturn(conf).when(pulsar).getConfiguration();
+
+ var pulsarResources = mock(PulsarResources.class);
+ var namespaceResources = mock(NamespaceResources.class);
+ var isolationPolicyResources = mock(NamespaceResources.IsolationPolicyResources.class);
+ var factory = mock(NamespaceBundleFactory.class);
+ var namespaceService = mock(NamespaceService.class);
+ localPoliciesResources = mock(LocalPoliciesResources.class);
+ antiAffinityGroupPolicyHelper = mock(AntiAffinityGroupPolicyHelper.class);
+ doReturn(namespaceService).when(pulsar).getNamespaceService();
+ doReturn(pulsarResources).when(pulsar).getPulsarResources();
+ doReturn(localPoliciesResources).when(pulsarResources).getLocalPolicies();
+ doReturn(namespaceResources).when(pulsarResources).getNamespaceResources();
+ doReturn(isolationPolicyResources).when(namespaceResources).getIsolationPolicies();
+ doReturn(Optional.empty()).when(localPoliciesResources).getLocalPolicies(any());
+ doReturn(Optional.empty()).when(isolationPolicyResources).getIsolationDataPolicies(any());
+ doReturn(factory).when(namespaceService).getNamespaceBundleFactory();
+ doAnswer(answer -> {
+ String namespace = answer.getArgument(0, String.class);
+ String bundleRange = answer.getArgument(1, String.class);
+ String[] boundaries = bundleRange.split("_");
+ Long lowerEndpoint = Long.decode(boundaries[0]);
+ Long upperEndpoint = Long.decode(boundaries[1]);
+ Range<Long> hashRange = Range.range(lowerEndpoint, BoundType.CLOSED, upperEndpoint,
+ (upperEndpoint.equals(NamespaceBundles.FULL_UPPER_BOUND)) ? BoundType.CLOSED : BoundType.OPEN);
+ return new NamespaceBundle(NamespaceName.get(namespace), hashRange, factory);
+ }).when(factory).getBundle(anyString(), anyString());
+ doReturn(true).when(antiAffinityGroupPolicyHelper).canUnload(any(), any(), any(), any());
+ }
public LoadManagerContext setupContext(){
var ctx = getContext();
ctx.brokerConfiguration().setLoadBalancerDebugModeEnabled(true);
@@ -101,11 +147,11 @@ public class TransferShedderTest {
brokerLoadDataStore.pushAsync("broker5", getCpuLoad(ctx, 90));
var topBundlesLoadDataStore = ctx.topBundleLoadDataStore();
- topBundlesLoadDataStore.pushAsync("broker1", getTopBundlesLoad("bundleA", 2000000, 1000000));
- topBundlesLoadDataStore.pushAsync("broker2", getTopBundlesLoad("bundleB", 3000000, 1000000));
- topBundlesLoadDataStore.pushAsync("broker3", getTopBundlesLoad("bundleC", 4000000, 2000000));
- topBundlesLoadDataStore.pushAsync("broker4", getTopBundlesLoad("bundleD", 6000000, 2000000));
- topBundlesLoadDataStore.pushAsync("broker5", getTopBundlesLoad("bundleE", 7000000, 2000000));
+ topBundlesLoadDataStore.pushAsync("broker1", getTopBundlesLoad("my-tenant/my-namespaceA", 2000000, 1000000));
+ topBundlesLoadDataStore.pushAsync("broker2", getTopBundlesLoad("my-tenant/my-namespaceB", 3000000, 1000000));
+ topBundlesLoadDataStore.pushAsync("broker3", getTopBundlesLoad("my-tenant/my-namespaceC", 4000000, 2000000));
+ topBundlesLoadDataStore.pushAsync("broker4", getTopBundlesLoad("my-tenant/my-namespaceD", 6000000, 2000000));
+ topBundlesLoadDataStore.pushAsync("broker5", getTopBundlesLoad("my-tenant/my-namespaceE", 7000000, 2000000));
return ctx;
}
@@ -151,8 +197,8 @@ public class TransferShedderTest {
var namespaceBundleStats2 = new NamespaceBundleStats();
namespaceBundleStats2.msgThroughputOut = load2;
var topKBundles = new TopKBundles();
- topKBundles.update(Map.of(bundlePrefix + "-1", namespaceBundleStats1,
- bundlePrefix + "-2", namespaceBundleStats2), 2);
+ topKBundles.update(Map.of(bundlePrefix + "/0x00000000_0x0FFFFFFF", namespaceBundleStats1,
+ bundlePrefix + "/0x0FFFFFFF_0xFFFFFFFF", namespaceBundleStats2), 2);
return topKBundles.getLoadData();
}
@@ -160,7 +206,7 @@ public class TransferShedderTest {
var namespaceBundleStats1 = new NamespaceBundleStats();
namespaceBundleStats1.msgThroughputOut = load1;
var topKBundles = new TopKBundles();
- topKBundles.update(Map.of(bundlePrefix + "-1", namespaceBundleStats1), 2);
+ topKBundles.update(Map.of(bundlePrefix + "/0x00000000_0x0FFFFFFF", namespaceBundleStats1), 2);
return topKBundles.getLoadData();
}
@@ -265,13 +311,20 @@ public class TransferShedderTest {
return map.size();
}
};
+
+ BrokerRegistry brokerRegistry = mock(BrokerRegistry.class);
+ doReturn(CompletableFuture.completedFuture(Map.of(
+ "broker1", mock(BrokerLookupData.class),
+ "broker2", mock(BrokerLookupData.class),
+ "broker3", mock(BrokerLookupData.class),
+ "broker4", mock(BrokerLookupData.class),
+ "broker5", mock(BrokerLookupData.class)
+ )))
+ .when(brokerRegistry).getAvailableBrokerLookupDataAsync();
doReturn(conf).when(ctx).brokerConfiguration();
doReturn(brokerLoadDataStore).when(ctx).brokerLoadDataStore();
doReturn(topBundleLoadDataStore).when(ctx).topBundleLoadDataStore();
- var brokerRegister = mock(BrokerRegistry.class);
- doReturn(brokerRegister).when(ctx).brokerRegistry();
- BrokerRegistry registry = ctx.brokerRegistry();
- doReturn(CompletableFuture.completedFuture(Map.of())).when(registry).getAvailableBrokerLookupDataAsync();
+ doReturn(brokerRegistry).when(ctx).brokerRegistry();
return ctx;
}
@@ -345,9 +398,9 @@ public class TransferShedderTest {
var expected = new UnloadDecision();
var unloads = expected.getUnloads();
unloads.put("broker5",
- new Unload("broker5", "bundleE-1", Optional.of("broker1")));
+ new Unload("broker5", bundleE1, Optional.of("broker1")));
unloads.put("broker4",
- new Unload("broker4", "bundleD-1", Optional.of("broker2")));
+ new Unload("broker4", bundleD1, Optional.of("broker2")));
expected.setLabel(Success);
expected.setReason(Overloaded);
@@ -371,10 +424,10 @@ public class TransferShedderTest {
var ctx = setupContext();
Map<String, Long> recentlyUnloadedBundles = new HashMap<>();
var now = System.currentTimeMillis();
- recentlyUnloadedBundles.put("bundleE-1", now);
- recentlyUnloadedBundles.put("bundleE-2", now);
- recentlyUnloadedBundles.put("bundleD-1", now);
- recentlyUnloadedBundles.put("bundleD-2", now);
+ recentlyUnloadedBundles.put(bundleE1, now);
+ recentlyUnloadedBundles.put(bundleE2, now);
+ recentlyUnloadedBundles.put(bundleD1, now);
+ recentlyUnloadedBundles.put(bundleD2, now);
var res = transferShedder.findBundlesForUnloading(ctx, recentlyUnloadedBundles, Map.of());
var expected = new UnloadDecision();
@@ -402,16 +455,10 @@ public class TransferShedderTest {
}
@Test(timeOut = 30 * 1000)
- public void testBundlesWithIsolationPolicies() throws IllegalAccessException, MetadataStoreException {
- var pulsar = getMockPulsar();
+ public void testBundlesWithIsolationPolicies() throws IllegalAccessException {
- TransferShedder transferShedder = new TransferShedder(pulsar);
- var pulsarResourcesMock = mock(PulsarResources.class);
- var localPoliciesResourcesMock = mock(LocalPoliciesResources.class);
- doReturn(pulsarResourcesMock).when(pulsar).getPulsarResources();
- doReturn(localPoliciesResourcesMock).when(pulsarResourcesMock).getLocalPolicies();
- doReturn(Optional.empty()).when(localPoliciesResourcesMock).getLocalPolicies(any());
+ TransferShedder transferShedder = new TransferShedder(pulsar, antiAffinityGroupPolicyHelper);
var allocationPoliciesSpy = (SimpleResourceAllocationPolicies)
spy(FieldUtils.readDeclaredField(transferShedder, "allocationPolicies", true));
@@ -423,31 +470,11 @@ public class TransferShedderTest {
setIsolationPolicies(allocationPoliciesSpy, "my-tenant/my-namespaceE",
Set.of("broker5"), Set.of(), Set.of(), 1);
var ctx = setupContext();
- BrokerRegistry registry = ctx.brokerRegistry();
- doReturn(CompletableFuture.completedFuture(Map.of(
- "broker1", getLookupData(),
- "broker2", getLookupData(),
- "broker3", getLookupData(),
- "broker4", getLookupData(),
- "broker5", getLookupData()))).when(registry).getAvailableBrokerLookupDataAsync();
-
- var topBundlesLoadDataStore = ctx.topBundleLoadDataStore();
- topBundlesLoadDataStore.pushAsync("broker1",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceA", 1, 3));
- topBundlesLoadDataStore.pushAsync("broker2",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceB", 2, 8));
- topBundlesLoadDataStore.pushAsync("broker3",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceC", 6, 10));
- topBundlesLoadDataStore.pushAsync("broker4",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceD", 10, 20));
- topBundlesLoadDataStore.pushAsync("broker5",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceE", 70, 20));
var res = transferShedder.findBundlesForUnloading(ctx, Map.of(), Map.of());
-
var expected = new UnloadDecision();
var unloads = expected.getUnloads();
unloads.put("broker4",
- new Unload("broker4", "my-tenant/my-namespaceD/0x7FFFFFF_0xFFFFFFF", Optional.of("broker2")));
+ new Unload("broker4", bundleD1, Optional.of("broker2")));
expected.setLabel(Success);
expected.setReason(Overloaded);
expected.setLoadAvg(setupLoadAvg);
@@ -455,37 +482,12 @@ public class TransferShedderTest {
assertEquals(res, expected);
// Test unload a has isolation policies broker.
-
- setIsolationPolicies(allocationPoliciesSpy, "my-tenant/my-namespaceE",
- Set.of("broker5"), Set.of(), Set.of(), 1);
- ctx = setupContext();
- registry = ctx.brokerRegistry();
- doReturn(CompletableFuture.completedFuture(Map.of(
- "broker1", getLookupData(),
- "broker2", getLookupData(),
- "broker3", getLookupData(),
- "broker4", getLookupData(),
- "broker5", getLookupData()))).when(registry).getAvailableBrokerLookupDataAsync();
-
ctx.brokerConfiguration().setLoadBalancerTransferEnabled(false);
-
- topBundlesLoadDataStore = ctx.topBundleLoadDataStore();
- topBundlesLoadDataStore.pushAsync("broker1",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceA", 1, 3));
- topBundlesLoadDataStore.pushAsync("broker2",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceB", 2, 8));
- topBundlesLoadDataStore.pushAsync("broker3",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceC", 6, 10));
- topBundlesLoadDataStore.pushAsync("broker4",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceD", 10, 20));
- topBundlesLoadDataStore.pushAsync("broker5",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceE", 70, 20));
res = transferShedder.findBundlesForUnloading(ctx, Map.of(), Map.of());
-
expected = new UnloadDecision();
unloads = expected.getUnloads();
unloads.put("broker4",
- new Unload("broker4", "my-tenant/my-namespaceD/0x7FFFFFF_0xFFFFFFF", Optional.empty()));
+ new Unload("broker4", bundleD1, Optional.empty()));
expected.setLabel(Success);
expected.setReason(Overloaded);
expected.setLoadAvg(setupLoadAvg);
@@ -567,31 +569,17 @@ public class TransferShedderTest {
@Test
public void testBundlesWithAntiAffinityGroup() throws IllegalAccessException, MetadataStoreException {
var pulsar = getMockPulsar();
- TransferShedder transferShedder = new TransferShedder(pulsar);
+ TransferShedder transferShedder = new TransferShedder(pulsar, antiAffinityGroupPolicyHelper);
var allocationPoliciesSpy = (SimpleResourceAllocationPolicies)
spy(FieldUtils.readDeclaredField(transferShedder, "allocationPolicies", true));
doReturn(false).when(allocationPoliciesSpy).areIsolationPoliciesPresent(any());
FieldUtils.writeDeclaredField(transferShedder, "allocationPolicies", allocationPoliciesSpy, true);
- var pulsarResourcesMock = mock(PulsarResources.class);
- var localPoliciesResourcesMock = mock(LocalPoliciesResources.class);
- doReturn(pulsarResourcesMock).when(pulsar).getPulsarResources();
- doReturn(localPoliciesResourcesMock).when(pulsarResourcesMock).getLocalPolicies();
LocalPolicies localPolicies = new LocalPolicies(null, null, "namespaceAntiAffinityGroup");
- doReturn(Optional.of(localPolicies)).when(localPoliciesResourcesMock).getLocalPolicies(any());
+ doReturn(Optional.of(localPolicies)).when(localPoliciesResources).getLocalPolicies(any());
var ctx = setupContext();
- var topBundlesLoadDataStore = ctx.topBundleLoadDataStore();
- topBundlesLoadDataStore.pushAsync("broker1",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceA", 1, 3));
- topBundlesLoadDataStore.pushAsync("broker2",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceB", 2, 8));
- topBundlesLoadDataStore.pushAsync("broker3",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceC", 6, 10));
- topBundlesLoadDataStore.pushAsync("broker4",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceD", 10, 20));
- topBundlesLoadDataStore.pushAsync("broker5",
- getTopBundlesLoadWithOutSuffix("my-tenant/my-namespaceE", 70, 20));
+ doReturn(false).when(antiAffinityGroupPolicyHelper).canUnload(any(), any(), any(), any());
var res = transferShedder.findBundlesForUnloading(ctx, Map.of(), Map.of());
var expected = new UnloadDecision();
@@ -600,6 +588,18 @@ public class TransferShedderTest {
expected.setLoadAvg(setupLoadAvg);
expected.setLoadStd(setupLoadStd);
assertEquals(res, expected);
+
+ doReturn(true).when(antiAffinityGroupPolicyHelper).canUnload(any(), eq(bundleE1), any(), any());
+ var res2 = transferShedder.findBundlesForUnloading(ctx, Map.of(), Map.of());
+ var expected2 = new UnloadDecision();
+ var unloads = expected2.getUnloads();
+ unloads.put("broker5",
+ new Unload("broker5", bundleE1, Optional.of("broker1")));
+ expected2.setLabel(Success);
+ expected2.setReason(Overloaded);
+ expected2.setLoadAvg(setupLoadAvg);
+ expected2.setLoadStd(setupLoadStd);
+ assertEquals(res2, expected2);
}
@Test
@@ -614,9 +614,9 @@ public class TransferShedderTest {
var topBundlesLoadDataStore = ctx.topBundleLoadDataStore();
- topBundlesLoadDataStore.pushAsync("broker1", getTopBundlesLoad("bundleA", 30, 30));
- topBundlesLoadDataStore.pushAsync("broker2", getTopBundlesLoad("bundleB", 40, 40));
- topBundlesLoadDataStore.pushAsync("broker3", getTopBundlesLoad("bundleC", 50, 50));
+ topBundlesLoadDataStore.pushAsync("broker1", getTopBundlesLoad("my-tenant/my-namespaceA", 30, 30));
+ topBundlesLoadDataStore.pushAsync("broker2", getTopBundlesLoad("my-tenant/my-namespaceB", 40, 40));
+ topBundlesLoadDataStore.pushAsync("broker3", getTopBundlesLoad("my-tenant/my-namespaceC", 50, 50));
var res = transferShedder.findBundlesForUnloading(ctx, Map.of(), Map.of());
@@ -633,11 +633,11 @@ public class TransferShedderTest {
TransferShedder transferShedder = new TransferShedder();
var ctx = setupContext();
var topBundlesLoadDataStore = ctx.topBundleLoadDataStore();
- topBundlesLoadDataStore.pushAsync("broker1", getTopBundlesLoad("bundleA", 1));
- topBundlesLoadDataStore.pushAsync("broker2", getTopBundlesLoad("bundleB", 2));
- topBundlesLoadDataStore.pushAsync("broker3", getTopBundlesLoad("bundleC", 6));
- topBundlesLoadDataStore.pushAsync("broker4", getTopBundlesLoad("bundleD", 10));
- topBundlesLoadDataStore.pushAsync("broker5", getTopBundlesLoad("bundleE", 70));
+ topBundlesLoadDataStore.pushAsync("broker1", getTopBundlesLoad("my-tenant/my-namespaceA", 1));
+ topBundlesLoadDataStore.pushAsync("broker2", getTopBundlesLoad("my-tenant/my-namespaceB", 2));
+ topBundlesLoadDataStore.pushAsync("broker3", getTopBundlesLoad("my-tenant/my-namespaceC", 6));
+ topBundlesLoadDataStore.pushAsync("broker4", getTopBundlesLoad("my-tenant/my-namespaceD", 10));
+ topBundlesLoadDataStore.pushAsync("broker5", getTopBundlesLoad("my-tenant/my-namespaceE", 70));
var res = transferShedder.findBundlesForUnloading(ctx, Map.of(), Map.of());
var expected = new UnloadDecision();
@@ -661,7 +661,7 @@ public class TransferShedderTest {
var expected = new UnloadDecision();
var unloads = expected.getUnloads();
unloads.put("broker5",
- new Unload("broker5", "bundleE-1", Optional.of("broker1")));
+ new Unload("broker5", bundleE1, Optional.of("broker1")));
expected.setLabel(Success);
expected.setReason(Overloaded);
expected.setLoadAvg(0.26400000000000007);
@@ -687,9 +687,9 @@ public class TransferShedderTest {
var expected = new UnloadDecision();
var unloads = expected.getUnloads();
unloads.put("broker5",
- new Unload("broker5", "bundleE-1", Optional.of("broker1")));
+ new Unload("broker5", bundleE1, Optional.of("broker1")));
unloads.put("broker4",
- new Unload("broker4", "bundleD-1", Optional.of("broker2")));
+ new Unload("broker4", bundleD1, Optional.of("broker2")));
expected.setLabel(Success);
expected.setReason(Underloaded);
expected.setLoadAvg(0.26400000000000007);
@@ -708,9 +708,9 @@ public class TransferShedderTest {
var expected = new UnloadDecision();
var unloads = expected.getUnloads();
unloads.put("broker5",
- new Unload("broker5", "bundleE-1", Optional.of("broker1")));
+ new Unload("broker5", bundleE1, Optional.of("broker1")));
unloads.put("broker4",
- new Unload("broker4", "bundleD-1", Optional.of("broker2")));
+ new Unload("broker4", bundleD1, Optional.of("broker2")));
expected.setLabel(Success);
expected.setReason(Overloaded);
expected.setLoadAvg(setupLoadAvg);
@@ -723,15 +723,15 @@ public class TransferShedderTest {
TransferShedder transferShedder = new TransferShedder();
var ctx = setupContext();
var topBundlesLoadDataStore = ctx.topBundleLoadDataStore();
- topBundlesLoadDataStore.pushAsync("broker5", getTopBundlesLoad("bundleE", 3000000, 2000000));
+ topBundlesLoadDataStore.pushAsync("broker5", getTopBundlesLoad("my-tenant/my-namespaceE", 3000000, 2000000));
var res = transferShedder.findBundlesForUnloading(ctx, Map.of(), Map.of());
var expected = new UnloadDecision();
var unloads = expected.getUnloads();
unloads.put("broker5",
- new Unload("broker5", "bundleE-1", Optional.of("broker1")));
+ new Unload("broker5", bundleE1, Optional.of("broker1")));
unloads.put("broker4",
- new Unload("broker4", "bundleD-1", Optional.of("broker2")));
+ new Unload("broker4", bundleD1, Optional.of("broker2")));
expected.setLabel(Success);
expected.setReason(Overloaded);
expected.setLoadAvg(setupLoadAvg);