Skip to content

[fix][broker] Fix incorrect unack msk count when dup ack a message - #20990

Merged
Technoboy- merged 3 commits into
apache:masterfrom
Technoboy-:fix-19348
Aug 18, 2023
Merged

[fix][broker] Fix incorrect unack msk count when dup ack a message#20990
Technoboy- merged 3 commits into
apache:masterfrom
Technoboy-:fix-19348

Conversation

@Technoboy-

@Technoboy- Technoboy- commented Aug 15, 2023

Copy link
Copy Markdown
Contributor

Fixes #19268

Modifications

When pendingAck not contains the message, it means the msg has been removed, so it can't update the unack msg count..

Documentation

  • doc
  • doc-required
  • doc-not-needed
  • doc-complete

@Technoboy- Technoboy- changed the title Fix incorrect unack msk count when dup ack a message [fix][broker] Fix incorrect unack msk count when dup ack a message Aug 15, 2023
@Technoboy- Technoboy- self-assigned this Aug 15, 2023
@Technoboy- Technoboy- added this to the 3.2.0 milestone Aug 15, 2023
@github-actions github-actions Bot added the doc-not-needed Your PR changes do not impact docs label Aug 15, 2023
@codelipenghui codelipenghui added the type/bug The PR fixed a bug or issue reported a bug label Aug 15, 2023
@Technoboy- Technoboy- closed this Aug 16, 2023
@Technoboy- Technoboy- reopened this Aug 16, 2023
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 72.72727% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 36.95%. Comparing base (63d9eaf) to head (fdac917).
⚠️ Report is 1771 commits behind head on master.

Files with missing lines Patch % Lines
...ava/org/apache/pulsar/broker/service/Consumer.java 72.72% 2 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #20990      +/-   ##
============================================
+ Coverage     36.92%   36.95%   +0.02%     
- Complexity    12187    12229      +42     
============================================
  Files          1698     1698              
  Lines        129846   129857      +11     
  Branches      14163    14163              
============================================
+ Hits          47947    47986      +39     
+ Misses        75570    75548      -22     
+ Partials       6329     6323       -6     
Flag Coverage Δ
inttests 24.29% <63.63%> (+0.14%) ⬆️
systests 25.18% <72.72%> (+0.02%) ⬆️
unittests 32.18% <63.63%> (+0.10%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...ava/org/apache/pulsar/broker/service/Consumer.java 63.47% <72.72%> (-1.09%) ⬇️

... and 59 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@shibd

shibd commented Oct 22, 2023

Copy link
Copy Markdown
Member

@Technoboy- Can you help create a PR to cherry-pick this change to branch-2.11?

shibd pushed a commit to shibd/pulsar that referenced this pull request Oct 25, 2023
nodece pushed a commit to nodece/pulsar that referenced this pull request Jan 11, 2024
…pache#20990)

(cherry picked from commit 4facdad)
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
nodece added a commit to ascentstream/pulsar that referenced this pull request Jan 16, 2024
* [fix][broker] Fix incorrect unack msk count when dup ack a message (apache#20990)

(cherry picked from commit 4facdad)
Signed-off-by: Zixuan Liu <nodeces@gmail.com>

* [fix][test] flaky test `testCanRecoverConsumptionWhenLiftMaxUnAckedMessagesRestriction` (apache#18726)

(cherry picked from commit 2d205c9)
Signed-off-by: Zixuan Liu <nodeces@gmail.com>

---------

Co-authored-by: Jiwei Guo <technoboy@apache.org>
Co-authored-by: labuladong <labuladong@foxmail.com>
nodece pushed a commit to nodece/pulsar that referenced this pull request Mar 8, 2024
nodece pushed a commit to nodece/pulsar that referenced this pull request Mar 8, 2024
nodece pushed a commit to nodece/pulsar that referenced this pull request Mar 8, 2024
nodece added a commit to ascentstream/pulsar that referenced this pull request Mar 15, 2024
* [fix][broker] Fix incorrect unack msk count when dup ack a message (apache#20990)

(cherry picked from commit 4facdad)
Signed-off-by: Zixuan Liu <nodeces@gmail.com>

* [fix][test] flaky test `testCanRecoverConsumptionWhenLiftMaxUnAckedMessagesRestriction` (apache#18726)

(cherry picked from commit 2d205c9)
Signed-off-by: Zixuan Liu <nodeces@gmail.com>

---------

Co-authored-by: Jiwei Guo <technoboy@apache.org>
Co-authored-by: labuladong <labuladong@foxmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug] Acknowledge the same message-id causes inconsistency unackedMessages number.

8 participants