Skip to content

[ISSUE #10052] Add capacity check in PopBufferMergeService.addCkJustOffset to prevent OOM #10567

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
wang-jiahua wants to merge 1 commit into
base: develop
Choose a base branch
from
+33 −0
Open

[ISSUE #10052] Add capacity check in PopBufferMergeService.addCkJustOffset to prevent OOM #10567

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
5 changes: 5 additions & 0 deletions broker/src/main/java/org/apache/rocketmq/broker/processor/PopBufferMergeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,11 @@ private boolean checkQueueOk(PopCheckPointWrapper pointWrapper) {
*/
public boolean addCkJustOffset(PopCheckPoint point, int reviveQueueId, long reviveQueueOffset,
long nextBeginOffset) {
if (this.counter.get() > brokerController.getBrokerConfig().getPopCkMaxBufferSize()) {
POP_LOGGER.warn("[PopBuffer]add ck just offset, max size, {}, {}", point, this.counter.get());
return false;
}
Comment thread
wang-jiahua marked this conversation as resolved.

Comment thread
wang-jiahua marked this conversation as resolved.
PopCheckPointWrapper pointWrapper = new PopCheckPointWrapper(reviveQueueId, reviveQueueOffset, point, nextBeginOffset, true);

if (this.buffer.containsKey(pointWrapper.getMergeKey())) {
Expand Down
28 changes: 28 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/processor/PopBufferMergeServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,32 @@ public void testPutAckToStore() throws Exception {
method.invoke(popBufferMergeService, pointWrapper, msgIndex, count);
verify(escapeBridge, times(1)).putMessageToSpecificQueue(any(MessageExtBrokerInner.class));
}

@Test
public void testAddCkJustOffsetMaxSize() {
// Set popCkMaxBufferSize to 0 so any addCkJustOffset should be rejected
when(brokerConfig.getPopCkMaxBufferSize()).thenReturn(0);

PopCheckPoint point1 = mock(PopCheckPoint.class);
when(point1.getTopic()).thenReturn("topic1");
when(point1.getCId()).thenReturn("cid1");
when(point1.getQueueId()).thenReturn(0);
when(point1.getStartOffset()).thenReturn(0L);
when(point1.getPopTime()).thenReturn(0L);
when(point1.getBrokerName()).thenReturn("");

// counter starts at 0, 0 > 0 is false, so first add succeeds and counter becomes 1
assertThat(popBufferMergeService.addCkJustOffset(point1, 0, 0, 0)).isTrue();

PopCheckPoint point2 = mock(PopCheckPoint.class);
when(point2.getTopic()).thenReturn("topic2");
when(point2.getCId()).thenReturn("cid2");
when(point2.getQueueId()).thenReturn(0);
when(point2.getStartOffset()).thenReturn(1L);
when(point2.getPopTime()).thenReturn(1L);
when(point2.getBrokerName()).thenReturn("");

// counter is now 1, 1 > 0 is true, so second add is rejected
assertThat(popBufferMergeService.addCkJustOffset(point2, 0, 0, 1)).isFalse();
}
}
Loading