You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ji...@apache.org on 2022/06/28 10:03:26 UTC
[pulsar] branch master updated: remove the unused conf field in the constructor of LeastLongTermMessageRate (#16096)
This is an automated email from the ASF dual-hosted git repository.
jianghaiting 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 e6ef5ec38a5 remove the unused conf field in the constructor of LeastLongTermMessageRate (#16096)
e6ef5ec38a5 is described below
commit e6ef5ec38a518f39e51b613214283ef89e360637
Author: Qiang Huang <HQ...@users.noreply.github.com>
AuthorDate: Tue Jun 28 18:03:19 2022 +0800
remove the unused conf field in the constructor of LeastLongTermMessageRate (#16096)
---
.../pulsar/broker/loadbalance/ModularLoadManagerStrategy.java | 8 +++-----
.../pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java | 2 +-
.../pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java | 2 +-
.../pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java
index 0143283d638..b2b4ee17c06 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategy.java
@@ -49,17 +49,15 @@ public interface ModularLoadManagerStrategy {
/**
* Create a placement strategy using the configuration.
*
- * @param conf
- * ServiceConfiguration to use.
* @return A placement strategy from the given configurations.
*/
- static ModularLoadManagerStrategy create(final ServiceConfiguration conf) {
+ static ModularLoadManagerStrategy create() {
try {
// Only one strategy at the moment.
- return new LeastLongTermMessageRate(conf);
+ return new LeastLongTermMessageRate();
} catch (Exception e) {
// Ignore
}
- return new LeastLongTermMessageRate(conf);
+ return new LeastLongTermMessageRate();
}
}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java
index 6ac49ab2cf3..d2662b6d981 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/LeastLongTermMessageRate.java
@@ -42,7 +42,7 @@ public class LeastLongTermMessageRate implements ModularLoadManagerStrategy {
// Maintain this list to reduce object creation.
private ArrayList<String> bestBrokers;
- public LeastLongTermMessageRate(final ServiceConfiguration conf) {
+ public LeastLongTermMessageRate() {
bestBrokers = new ArrayList<>();
}
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 a32b52ea844..c95b2b53b3b 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
@@ -265,7 +265,7 @@ public class ModularLoadManagerImpl implements ModularLoadManager {
defaultStats.msgRateIn = DEFAULT_MESSAGE_RATE;
defaultStats.msgRateOut = DEFAULT_MESSAGE_RATE;
- placementStrategy = ModularLoadManagerStrategy.create(conf);
+ placementStrategy = ModularLoadManagerStrategy.create();
policies = new SimpleResourceAllocationPolicies(pulsar);
filterPipeline.add(new BrokerVersionFilter());
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java
index c767a650c47..999d282d3b5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/ModularLoadManagerStrategyTest.java
@@ -51,7 +51,7 @@ public class ModularLoadManagerStrategyTest {
brokerDataMap.put("2", brokerData2);
brokerDataMap.put("3", brokerData3);
ServiceConfiguration conf = new ServiceConfiguration();
- ModularLoadManagerStrategy strategy = new LeastLongTermMessageRate(conf);
+ ModularLoadManagerStrategy strategy = new LeastLongTermMessageRate();
assertEquals(strategy.selectBroker(brokerDataMap.keySet(), bundleData, loadData, conf), Optional.of("1"));
brokerData1.getTimeAverageData().setLongTermMsgRateIn(400);
assertEquals(strategy.selectBroker(brokerDataMap.keySet(), bundleData, loadData, conf), Optional.of("2"));