Skip to content

[branch-2.8][improve][broker] Recycle OpReadEntry in some corner cases (#16399) - #16869

Merged
BewareMyPower merged 2 commits into
branch-2.8from
bewaremypower/2.8-pick-16399
Aug 2, 2022
Merged

[branch-2.8][improve][broker] Recycle OpReadEntry in some corner cases (#16399)#16869
BewareMyPower merged 2 commits into
branch-2.8from
bewaremypower/2.8-pick-16399

Conversation

@BewareMyPower

@BewareMyPower BewareMyPower commented Jul 29, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor

(cherry picked from commit 6cec62e)

Compared to #16399, this PR uses PowerMock instead of mockito because
the branch-2.8 doesn't import the mockito-inline dependency.

Documentation

Check the box below or label this PR directly.

Need to update docs?

  • doc-required
    (Your PR needs to update docs and you will update later)

  • doc-not-needed
    (Please explain why)

  • doc
    (Your PR contains doc changes)

  • doc-complete
    (Docs have been already added)

@BewareMyPower BewareMyPower self-assigned this Jul 29, 2022
@BewareMyPower BewareMyPower mentioned this pull request Jul 29, 2022
Merged
4 tasks
@BewareMyPower

BewareMyPower commented Aug 1, 2022

Copy link
Copy Markdown
Contributor Author

Some tests failed with NotAMockException, I will fix them soon.

@BewareMyPower
[improve][broker] Recycle OpReadEntry in some corner cases (#16399)
e3391b6 
(cherry picked from commit 6cec62e)

In addition to #16399, this PR imports the `mockito-inline` dependency
to fix the test failure.
@BewareMyPower
Use PowerMock instead of mockito-inline
6b7936e
@BewareMyPower
BewareMyPower force-pushed the bewaremypower/2.8-pick-16399 branch from 06885db to 6b7936e Compare August 1, 2022 08:03
@BewareMyPower

BewareMyPower commented Aug 1, 2022

Copy link
Copy Markdown
Contributor Author

I removed the mockito-inline dependency to use PowerMock instead because there are too many existing tests that are based on PowerMock and incompatible with mockito. Using mockito-inline requires a lot of code changes, see #14098.

@BewareMyPower
BewareMyPower merged commit 123175f into branch-2.8 Aug 2, 2022
@BewareMyPower
BewareMyPower deleted the bewaremypower/2.8-pick-16399 branch August 2, 2022 07:56
@BewareMyPower BewareMyPower added the cherry-picked/branch-2.8 Archived: 2.8 is end of life label Aug 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@eolivelli eolivelli eolivelli approved these changes
@Demogorgon314 Demogorgon314 Demogorgon314 approved these changes
@merlimat merlimat Awaiting requested review from merlimat
@Technoboy- Technoboy- Awaiting requested review from Technoboy-
@codelipenghui codelipenghui Awaiting requested review from codelipenghui
@congbobo184 congbobo184 Awaiting requested review from congbobo184

Assignees

@BewareMyPower BewareMyPower

Labels

cherry-picked/branch-2.8 Archived: 2.8 is end of life release/2.8.4

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@BewareMyPower @eolivelli @Demogorgon314