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

[Don't merge][cherry-pick][branch-2.11] Cherry-pick some PR to branch-2.11 #21427

Closed
wants to merge 11 commits into from

Conversation

shibd
Copy link
Member

@shibd shibd commented Oct 24, 2023

Motivation

Release v2.11.3

Modifications

Pick some conflict-free PRs to branch-2.11:

Verifying this change

  • Test passed.

Does this pull request potentially affect one of the following parts:

  • Dependencies (add or upgrade a dependency)
  • The public API
  • The schema
  • The default values of configurations
  • The threading model
  • The binary protocol
  • The REST endpoints
  • The admin CLI options
  • The metrics
  • Anything that affects deployment

Documentation

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

Matching PR in forked repository

TakaHiR07 and others added 11 commits October 24, 2023 10:12
…o after bkclient initialize (apache#20944)

(cherry picked from commit d9ebaf5)
…ed on topic, when dedup is enabled and no producer is there (apache#20951)

(cherry picked from commit 30073db)
…currently (apache#20971)

**Background**: when calling `pulsar-admin topics stats --get-earliest-time-in-backlog <topic name>`, Pulsar will read the first entry which is not acknowledged, and respond with the entry write time. The flow is like this:
- get the mark deleted position of the subscription
- if no backlog, response `-1`
- else read the next position of the mark deleted position, and respond with the entry write time.

**Issue**: if the command `pulsar-admin topics stats --get-earliest-time-in-backlog <topic name>` and `consumer.acknowledge` are executed at the same time, the step 2 in above flow will get a position which is larger than the last confirmed position, lead a read entry error.

| time | `pulsar-admin topics stats --get-earliest-time-in-backlog <topic name>` | `consumer.acknowledge` |
| --- | --- | --- |
| 1 | mark deleted position is `3:1` and LAC is `3:2` now |
| 2 | the check `whether has backlog` is passed |
| 3 | | acknowledged `3:2`, mark deleted position is `3:2` now |
| 4 | calculate next position: `3:3` |
| 5 | Read `3:3` and get an error: `read entry failed` |

Note: the test in PR is not intended to reproduce the issue.

Respond `-1` if the next position of the mark deleted position is larger than the LAC

(cherry picked from commit 7c96a36)
…MinNumRacksPerWriteQuorum not work problem. (apache#21327)

(cherry picked from commit 61a7adf)
…elete heartbeat topic (apache#21360)

Co-authored-by: fanjianye <[email protected]>
Co-authored-by: Jiwei Guo <[email protected]>
(cherry picked from commit 700a29d)
… in ModularLoadManagerImpl (apache#19656)

(cherry picked from commit 145e985)
@shibd shibd self-assigned this Oct 24, 2023
@github-actions github-actions bot added the doc-not-needed Your PR changes do not impact docs label Oct 24, 2023
@shibd shibd closed this Oct 24, 2023
@shibd shibd reopened this Oct 24, 2023
@mattisonchao
Copy link
Member

mattisonchao commented Oct 24, 2023

Please do not squash merge this PR, thanks! it will ruin the history of commits.

It's better to cherry-pick them one-by-one

@shibd shibd changed the title [cherry-pick][branch-2.11] Cherry-pick some PR to branch-2.11 [Don't merge][cherry-pick][branch-2.11] Cherry-pick some PR to branch-2.11 Oct 24, 2023
@shibd shibd closed this Oct 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc-not-needed Your PR changes do not impact docs ready-to-test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants