Skip to content

[ISSUE #10851] fix(broker): avoid cold threshold sort overflow #10856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuluo-yx wants to merge 1 commit into
base: develop
Choose a base branch
from
+26 −1
Open

[ISSUE #10851] fix(broker): avoid cold threshold sort overflow #10856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion broker/src/main/java/org/apache/rocketmq/broker/coldctr/ColdDataCgCtrService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private void sortAndDecelerate() {
configMapList.sort(new Comparator<Entry<String, Long>>() {
@Override
public int compare(Entry<String, Long> o1, Entry<String, Long> o2) {
return (int)(o2.getValue() - o1.getValue());
return Long.compare(o2.getValue(), o1.getValue());
}
});
Iterator<Entry<String, Long>> iterator = configMapList.iterator();
Expand Down
25 changes: 25 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/coldctr/ColdDataCgCtrServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.rocketmq.broker.coldctr;

import java.lang.reflect.Method;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.rocketmq.broker.BrokerController;
import org.apache.rocketmq.common.BrokerConfig;
Expand All @@ -32,6 +33,11 @@
import java.util.concurrent.atomic.AtomicLong;

import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

@RunWith(MockitoJUnitRunner.class)
Expand Down Expand Up @@ -63,6 +69,25 @@ public void testGetColdDataFlowCtrInfo() {
assertTrue(actual.contains("\"runtimeTable\":{\"consumerGroup1\":{\"coldAcc\":1,\"createTimeMills\":1,\"lastColdReadTimeMills\":1}}"));
}

@Test
public void testDeceleratesHighestThresholdsWithoutOverflow() throws Exception {
ConcurrentHashMap<String, Long> thresholds = new ConcurrentHashMap<>();
thresholds.put("highest||adaptive", Long.MAX_VALUE);
thresholds.put("medium2||adaptive", 2L);
thresholds.put("medium1||adaptive", 1L);
thresholds.put("lowest||adaptive", 0L);
ColdCtrStrategy strategy = mock(ColdCtrStrategy.class);
FieldUtils.writeField(coldDataCgCtrService, "cgColdThresholdMapConfig", thresholds, true);
FieldUtils.writeField(coldDataCgCtrService, "coldCtrStrategy", strategy, true);
Method method = ColdDataCgCtrService.class.getDeclaredMethod("sortAndDecelerate");
method.setAccessible(true);

method.invoke(coldDataCgCtrService);

verify(strategy).decelerate(eq("highest||adaptive"), anyLong());
verify(strategy, never()).decelerate(eq("lowest||adaptive"), anyLong());
}

private Map<String, AccAndTimeStamp> createCgColdThresholdMapRuntime() {
Map<String, AccAndTimeStamp> result = new ConcurrentHashMap<>();
AccAndTimeStamp accAndTimeStamp = new AccAndTimeStamp(new AtomicLong(1L));
Expand Down
Loading