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.

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

[ISSUE #7480] Fix the offset in the timerCheckPoint will not be corrected when the commitlog and consumeQueue are truncated #7488

Merged
merged 3 commits into from
Dec 4, 2024

Conversation

RongtongJin
Copy link
Contributor

Which Issue(s) This PR Fixes

Fixes #7480

Brief Description

Fix the offset in the timerCheckPoint will not be corrected when the commitlog and consumeQueue are truncated

How Did You Test This Change?

@RongtongJin RongtongJin marked this pull request as draft October 20, 2023 03:20
@codecov-commenter
Copy link

Codecov Report

Merging #7488 (ae2c2b1) into develop (f0f15b5) will increase coverage by 0.04%.
Report is 4 commits behind head on develop.
The diff coverage is 9.09%.

@@              Coverage Diff              @@
##             develop    #7488      +/-   ##
=============================================
+ Coverage      42.93%   42.98%   +0.04%     
- Complexity      9660     9677      +17     
=============================================
  Files           1161     1161              
  Lines          83930    83959      +29     
  Branches       10898    10901       +3     
=============================================
+ Hits           36038    36087      +49     
+ Misses         43410    43399      -11     
+ Partials        4482     4473       -9     
Files Coverage Δ
...che/rocketmq/acl/plain/PlainPermissionManager.java 78.37% <0.00%> (ø)
...apache/rocketmq/store/timer/TimerMessageStore.java 53.47% <10.00%> (-0.37%) ⬇️

... and 29 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@RongtongJin RongtongJin marked this pull request as ready for review October 24, 2023 05:50
ConsumeQueueInterface cq = this.messageStore.getConsumeQueue(TIMER_TOPIC, 0);

// Correction based consume queue
if (cq != null && currQueueOffset < cq.getMinOffsetInQueue()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currQueueOffset < cq.getMinOffsetInQueue() 这个情况什么时候出现,应该比较少吧

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

主要是commitlog和cq数据被截断的时候,但timer这里是不会修正的

Copy link
Member

@cserwen cserwen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@GenerousMan GenerousMan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@guyinyou guyinyou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@RongtongJin RongtongJin merged commit f4c4984 into apache:develop Dec 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
9 participants