Skip to content
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

Jump to bottom

Fix committed offset is always less than log-end-offset by 1 #634

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix committed offset is always less than log-end-offset by 1 #634

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
84e064a
Fix committed offset was always less than log-end-offset by 1
shamanu4 Aug 19, 2020
c18fdaf
Merge pull request #1 from Linkalong/fix_kafka_topic_lag
shamanu4 Aug 19, 2020
0372e44
Merge branch 'master' into master
shamanu4 Nov 10, 2020
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
6 changes: 3 additions & 3 deletions faust/transport/consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ def ack(self, message: Message) -> bool:
if self.app.topics.acks_enabled_for(message.topic):
committed = self._committed_offset[tp]
try:
if committed is None or offset > committed:
if committed is None or offset >= committed:
acked_index = self._acked_index[tp]
if offset not in acked_index:
self._unacked_messages.discard(message)
Expand Down Expand Up @@ -1005,7 +1005,7 @@ def _new_offset(self, tp: TP) -> Optional[int]:
acked[:len(batch) - 1] = []
self._acked_index[tp].difference_update(batch)
# return the highest commit offset
return batch[-1]
return batch[-1] + 1
return None

async def on_task_error(self, exc: BaseException) -> None:
Expand Down Expand Up @@ -1059,7 +1059,7 @@ async def _drain_messages(

offset = message.offset
r_offset = get_read_offset(tp)
if r_offset is None or offset > r_offset:
if r_offset is None or offset >= r_offset:
gap = offset - (r_offset or 0)
# We have a gap in income messages
if gap > 1 and r_offset:
Expand Down
19 changes: 10 additions & 9 deletions t/unit/transport/test_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,8 @@ def test_filter_committable_offsets(self, *, consumer):
TP2: 30,
}
assert consumer._filter_committable_offsets({TP1, TP2}) == {
TP2: 36,
TP1: 5,
TP2: 37,
}

@pytest.mark.asyncio
Expand Down Expand Up @@ -959,21 +960,21 @@ def test_should_commit(self, tp, offset, committed, should, *, consumer):

@pytest.mark.parametrize('tp,acked,expected_offset', [
(TP1, [], None),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 10),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 10], 8),
(TP1, [1, 2, 3, 4, 6, 7, 8, 10], 4),
(TP1, [1, 3, 4, 6, 7, 8, 10], 1),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 11),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 10], 9),
(TP1, [1, 2, 3, 4, 6, 7, 8, 10], 5),
(TP1, [1, 3, 4, 6, 7, 8, 10], 2),
])
def test_new_offset(self, tp, acked, expected_offset, *, consumer):
consumer._acked[tp] = acked
assert consumer._new_offset(tp) == expected_offset

@pytest.mark.parametrize('tp,acked,gaps,expected_offset', [
(TP1, [], [], None),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [], 10),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 10], [9], 10),
(TP1, [1, 2, 3, 4, 6, 7, 8, 10], [5], 8),
(TP1, [1, 3, 4, 6, 7, 8, 10], [2, 5, 9], 10),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [], 11),
(TP1, [1, 2, 3, 4, 5, 6, 7, 8, 10], [9], 11),
(TP1, [1, 2, 3, 4, 6, 7, 8, 10], [5], 9),
(TP1, [1, 3, 4, 6, 7, 8, 10], [2, 5, 9], 11),
])
def test_new_offset_with_gaps(self, tp, acked, gaps,
expected_offset, *, consumer):
Expand Down