From f79cbe4d24d9f6c2eee4ed9314f92f53c226d91e Mon Sep 17 00:00:00 2001 From: weihu Date: Thu, 8 Jun 2023 11:36:20 +0800 Subject: [PATCH 1/3] Adding null does not update --- .../apache/rocketmq/broker/controller/ReplicasManager.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java index abae7cdb01a..6543db66f49 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java @@ -32,7 +32,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; - +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.broker.out.BrokerOuterAPI; @@ -801,7 +801,10 @@ private void scanAvailableControllerAddresses() { private void updateControllerAddr() { if (brokerConfig.isFetchControllerAddrByDnsLookup()) { - this.controllerAddresses = brokerOuterAPI.dnsLookupAddressByDomain(this.brokerConfig.getControllerAddr()); + List addrs = brokerOuterAPI.dnsLookupAddressByDomain(this.brokerConfig.getControllerAddr()); + if (CollectionUtils.isNotEmpty(addrs)) { + this.controllerAddresses = addrs; + } } else { final String controllerPaths = this.brokerConfig.getControllerAddr(); final String[] controllers = controllerPaths.split(";"); From 9eb378eb6655c588ed316534c9b85946ac2309eb Mon Sep 17 00:00:00 2001 From: weihu Date: Wed, 22 May 2024 16:06:21 +0800 Subject: [PATCH 2/3] rolling back --- .../apache/rocketmq/broker/controller/ReplicasManager.java | 7 ++----- .../java/org/apache/rocketmq/common/stats/StatsItem.java | 1 - distribution/bin/os.sh | 2 +- .../java/org/apache/rocketmq/example/simple/Producer.java | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java index 1c8e8988030..a1d711cb275 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/controller/ReplicasManager.java @@ -30,7 +30,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.commons.collections.CollectionUtils; + import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.broker.out.BrokerOuterAPI; @@ -803,10 +803,7 @@ private void scanAvailableControllerAddresses() { private void updateControllerAddr() { if (brokerConfig.isFetchControllerAddrByDnsLookup()) { - List addrs = brokerOuterAPI.dnsLookupAddressByDomain(this.brokerConfig.getControllerAddr()); - if (CollectionUtils.isNotEmpty(addrs)) { - this.controllerAddresses = addrs; - } + this.controllerAddresses = brokerOuterAPI.dnsLookupAddressByDomain(this.brokerConfig.getControllerAddr()); } else { final String controllerPaths = this.brokerConfig.getControllerAddr(); final String[] controllers = controllerPaths.split(";"); diff --git a/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java b/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java index 1d2ac32a218..8307c20aa68 100644 --- a/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java +++ b/common/src/main/java/org/apache/rocketmq/common/stats/StatsItem.java @@ -17,7 +17,6 @@ package org.apache.rocketmq.common.stats; -import java.util.Collections; import java.util.LinkedList; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/distribution/bin/os.sh b/distribution/bin/os.sh index 1c9c717b2b2..1a8a6cdfbb2 100644 --- a/distribution/bin/os.sh +++ b/distribution/bin/os.sh @@ -50,7 +50,7 @@ sysctl vm.max_map_count sysctl vm.dirty_background_ratio sysctl vm.dirty_ratio sysctl vm.dirty_writeback_centisecs -sysctl vm.page-clusterH +sysctl vm.page-cluster sysctl vm.swappiness su - admin -c 'ulimit -n' diff --git a/example/src/main/java/org/apache/rocketmq/example/simple/Producer.java b/example/src/main/java/org/apache/rocketmq/example/simple/Producer.java index e3475528662..920d481b939 100644 --- a/example/src/main/java/org/apache/rocketmq/example/simple/Producer.java +++ b/example/src/main/java/org/apache/rocketmq/example/simple/Producer.java @@ -34,7 +34,7 @@ public static void main(String[] args) throws MQClientException, InterruptedExce DefaultMQProducer producer = new DefaultMQProducer(PRODUCER_GROUP); // Uncomment the following line while debugging, namesrvAddr should be set to your local address - producer.setNamesrvAddr(DEFAULT_NAMESRVADDR); + //producer.setNamesrvAddr(DEFAULT_NAMESRVADDR); producer.start(); for (int i = 0; i < 128; i++) { From 4cbf0a19d3b9eb8770a68a002989ffc01603439a Mon Sep 17 00:00:00 2001 From: weihu Date: Tue, 11 Jun 2024 16:52:07 +0800 Subject: [PATCH 3/3] optimisation code --- .../broker/coldctr/ColdDataCgCtrService.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/coldctr/ColdDataCgCtrService.java b/broker/src/main/java/org/apache/rocketmq/broker/coldctr/ColdDataCgCtrService.java index dd9278fb755..9ff5172d549 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/coldctr/ColdDataCgCtrService.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/coldctr/ColdDataCgCtrService.java @@ -16,16 +16,13 @@ */ package org.apache.rocketmq.broker.coldctr; +import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; -import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; - -import com.alibaba.fastjson.JSONObject; - import org.apache.rocketmq.broker.BrokerController; import org.apache.rocketmq.common.BrokerConfig; import org.apache.rocketmq.common.MixAll; @@ -142,20 +139,15 @@ private void clearDataAcc() { } private void sortAndDecelerate() { - List> configMapList = new ArrayList>(cgColdThresholdMapConfig.entrySet()); - configMapList.sort(new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return (int)(o2.getValue() - o1.getValue()); - } - }); + List> configMapList = new ArrayList<>(cgColdThresholdMapConfig.entrySet()); + configMapList.sort((o1, o2) -> (int)(o2.getValue() - o1.getValue())); Iterator> iterator = configMapList.iterator(); int maxDecelerate = 3; while (iterator.hasNext() && maxDecelerate > 0) { Entry next = iterator.next(); if (!isAdminConfig(next.getKey())) { coldCtrStrategy.decelerate(next.getKey(), getThresholdByConsumerGroup(next.getKey())); - maxDecelerate --; + maxDecelerate--; } } }