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

[fix][broker][branch-2.10] Fix NPE when reset Replicator's cursor by position. (#20597) #20781

Merged
merged 3 commits into from
Jul 12, 2023

Conversation

liangyepianzhou
Copy link
Contributor

Motivation

Cherry-pick #20597 and guarantee compatibility.

Verifying this change

  • Make sure that the change passes the CI checks.

(Please pick either of the following options)

This change is a trivial rework / code cleanup without any test coverage.

(or)

This change is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(example:)

  • Added integration tests for end-to-end deployment with large payloads (10MB)
  • Extended integration test for recovery after broker failure

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

If the box was checked, please highlight the changes

  • 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

PR in forked repository:

@github-actions github-actions bot added the doc-not-needed Your PR changes do not impact docs label Jul 11, 2023
@codelipenghui codelipenghui merged commit 643ffad into branch-2.10 Jul 12, 2023
@BewareMyPower BewareMyPower deleted the xiangying/branch-2.10/20597 branch July 12, 2023 07:01
BewareMyPower added a commit that referenced this pull request Jul 12, 2023
…eExpiryMonitor

### Motivation

#20781 adds a new constructor to
`PersistentMessageExpiryMonitor` and initialize the old constructor with

```java
this.topic = subscription.topic;
```

NPE will happen when `subscription` is null. However, it's allowed to
pass a null `subscription` for test because methods like
`findEntryFailed` don't depend on the `topic` field.

### Modifications

Add the null check and mark the old constructor as deprecated.
nicoloboschi pushed a commit to datastax/pulsar that referenced this pull request Jul 17, 2023
nicoloboschi pushed a commit to datastax/pulsar that referenced this pull request Jul 17, 2023
…eExpiryMonitor

### Motivation

apache#20781 adds a new constructor to
`PersistentMessageExpiryMonitor` and initialize the old constructor with

```java
this.topic = subscription.topic;
```

NPE will happen when `subscription` is null. However, it's allowed to
pass a null `subscription` for test because methods like
`findEntryFailed` don't depend on the `topic` field.

### Modifications

Add the null check and mark the old constructor as deprecated.

(cherry picked from commit 5c55633)
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants