From 33e7cafa23163c32ce0fc0a4c12c900dc2f2a1d0 Mon Sep 17 00:00:00 2001 From: lordcheng10 Date: Wed, 22 Mar 2023 14:09:12 +0800 Subject: [PATCH 1/3] add UniformMessageRate --- .../loadbalance/impl/UniformMessageRate.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java new file mode 100644 index 0000000000000..02363b7c2f297 --- /dev/null +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java @@ -0,0 +1,40 @@ +package org.apache.pulsar.broker.loadbalance.impl; + +import org.apache.commons.lang3.mutable.MutableDouble; +import org.apache.commons.lang3.mutable.MutableObject; +import org.apache.pulsar.broker.ServiceConfiguration; +import org.apache.pulsar.broker.loadbalance.LoadData; +import org.apache.pulsar.broker.loadbalance.ModularLoadManagerStrategy; +import org.apache.pulsar.policies.data.loadbalancer.BrokerData; +import org.apache.pulsar.policies.data.loadbalancer.BundleData; +import org.apache.pulsar.policies.data.loadbalancer.TimeAverageBrokerData; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +public class UniformMessageRate implements ModularLoadManagerStrategy { + @Override + public Optional selectBroker(Set candidates, BundleData bundleToAssign, LoadData loadData, ServiceConfiguration conf) { + Map brokersData = loadData.getBrokerData(); + MutableObject underloadedBroker = new MutableObject<>(); + MutableDouble minMsgRate = new MutableDouble(Integer.MAX_VALUE); + MutableDouble minThroughputRate = new MutableDouble(Integer.MAX_VALUE); + brokersData.forEach((broker, data) -> { + TimeAverageBrokerData timeAverageData = data.getTimeAverageData(); + double msgRate = timeAverageData.getLongTermMsgRateIn() + + timeAverageData.getLongTermMsgRateOut(); + double throughputRate = timeAverageData.getLongTermMsgThroughputIn() + + timeAverageData.getLongTermMsgThroughputOut(); + + if (((conf.getLoadBalancerMsgRateDifferenceShedderThreshold() > 0) && (msgRate < minMsgRate.getValue())) + || ((conf.getLoadBalancerMsgThroughputMultiplierDifferenceShedderThreshold() > 0) + && (throughputRate < minThroughputRate.getValue()))) { + underloadedBroker.setValue(broker); + minMsgRate.setValue(msgRate); + minThroughputRate.setValue(throughputRate); + } + }); + + return Optional.of(underloadedBroker.getValue()); + } +} From 4c9e0bae03d1277603e3b888809fd05a9670f8f0 Mon Sep 17 00:00:00 2001 From: lordcheng10 Date: Wed, 22 Mar 2023 14:15:39 +0800 Subject: [PATCH 2/3] check style --- .../loadbalance/impl/UniformMessageRate.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java index 02363b7c2f297..09d7de27a5778 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java @@ -1,3 +1,21 @@ +/* + * 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.impl; import org.apache.commons.lang3.mutable.MutableDouble; From 1ad644fff57e2d0d081999408f5226184923fa71 Mon Sep 17 00:00:00 2001 From: lordcheng10 Date: Wed, 22 Mar 2023 14:40:02 +0800 Subject: [PATCH 3/3] use short term --- .../broker/loadbalance/impl/UniformMessageRate.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java index 09d7de27a5778..82b4ad9cfeb46 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/UniformMessageRate.java @@ -39,10 +39,10 @@ public Optional selectBroker(Set candidates, BundleData bundleTo MutableDouble minThroughputRate = new MutableDouble(Integer.MAX_VALUE); brokersData.forEach((broker, data) -> { TimeAverageBrokerData timeAverageData = data.getTimeAverageData(); - double msgRate = timeAverageData.getLongTermMsgRateIn() - + timeAverageData.getLongTermMsgRateOut(); - double throughputRate = timeAverageData.getLongTermMsgThroughputIn() - + timeAverageData.getLongTermMsgThroughputOut(); + double msgRate = timeAverageData.getShortTermMsgRateIn() + + timeAverageData.getShortTermMsgRateOut(); + double throughputRate = timeAverageData.getShortTermMsgThroughputIn() + + timeAverageData.getShortTermMsgThroughputOut(); if (((conf.getLoadBalancerMsgRateDifferenceShedderThreshold() > 0) && (msgRate < minMsgRate.getValue())) || ((conf.getLoadBalancerMsgThroughputMultiplierDifferenceShedderThreshold() > 0)