Skip to content

Fix offset maybe lost problem. #1427

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

Closed
aftersss wants to merge 3 commits into from
Closed

Fix offset maybe lost problem. #1427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebf00f2
Fix offset maybe lost problem.
Aug 29, 2019
8a30f80
Checkstyle
Aug 29, 2019
bf459e5
Add unit test for ConsumerOffsetManager
Oct 28, 2019
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
13 changes: 6 additions & 7 deletions broker/src/main/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,12 @@ private void commitOffset(final String clientHost, final String key, final int q
ConcurrentMap<Integer, Long> map = this.offsetTable.get(key);
if (null == map) {
map = new ConcurrentHashMap<Integer, Long>(32);
map.put(queueId, offset);
this.offsetTable.put(key, map);
} else {
Long storeOffset = map.put(queueId, offset);
if (storeOffset != null && offset < storeOffset) {
log.warn("[NOTIFYME]update consumer offset less than store. clientHost={}, key={}, queueId={}, requestOffset={}, storeOffset={}", clientHost, key, queueId, offset, storeOffset);
}
this.offsetTable.putIfAbsent(key, map);
map = this.offsetTable.get(key);
}
Long storeOffset = map.put(queueId, offset);
if (storeOffset != null && offset < storeOffset) {
log.warn("[NOTIFYME]update consumer offset less than store. clientHost={}, key={}, queueId={}, requestOffset={}, storeOffset={}", clientHost, key, queueId, offset, storeOffset);
}
}

Expand Down
33 changes: 33 additions & 0 deletions broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package org.apache.rocketmq.broker.offset;

import java.util.Map;

import org.junit.Assert;
import org.junit.Test;

public class ConsumerOffsetManagerTest {

@Test
public void testCommitOffset() {
ConsumerOffsetManager consumerOffsetManager = new ConsumerOffsetManager();
String group = "testGroup";
String topic = "testTopic";
int queueId = 1;
long offset = 100;
consumerOffsetManager.commitOffset("127.0.0.1", group, topic, queueId, offset);
long actualOffset = consumerOffsetManager.queryOffset(group, topic, queueId);
Assert.assertEquals(offset, actualOffset);

Map<Integer, Long> map = consumerOffsetManager.queryOffset(group, topic);
Assert.assertEquals(offset, map.get(queueId).longValue());

offset = 101;
consumerOffsetManager.commitOffset("127.0.0.1", group, topic, queueId, offset);

actualOffset = consumerOffsetManager.queryOffset(group, topic, queueId);
Assert.assertEquals(offset, actualOffset);

map = consumerOffsetManager.queryOffset(group, topic);
Assert.assertEquals(offset, map.get(queueId).longValue());
}
}