Fix NPE when MultiTopicsConsumerImpl receives null value messages #9113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/pulsarbot run-failure-checks |
sijie
approved these changes
Jan 4, 2021
BewareMyPower
deleted the
bewaremypower/fix-multi-topics-consumer-null-value
branch
|
Remove from release 2.6.3 since conflict with #9046 |
|
@codelipenghui it might worth cherry-picking the change and submit a separate pull request. |
codelipenghui
pushed a commit
that referenced
this pull request
Jan 6, 2021
) [#6379](#6379) introduced the feature to handle null value messages, but it only checks the null value in `ConsumerImpl` when `INCOMING_MESSAGES_SIZE_UPDATER` is updated. Therefore, if a partitioned topic with at least 2 partitions was consumed with a null value message, the NPE would be thrown. - Check the null value message in `MultiTopicsConsumerImpl` as well as `ConsumerImpl`. To reduce repeated code, two protected methods are added to `ConsumerBase` and `INCOMING_MESSAGES_SIZE_UPDATER` becomes private now, the derived consumer classes just use these two methods to update or reset `INCOMING_MESSAGES_SIZE_UPDATER`. - Add tests for partitioned topics in `NullValueTest`. Since the existed tests rely on the message send order, here we only send messages to a single partition only. (cherry picked from commit dd3b9d8)
codelipenghui
added
cherry-picked/branch-2.6
cherry-picked/branch-2.7
codelipenghui
pushed a commit
that referenced
this pull request
Jan 7, 2021
) ### Motivation [#6379](#6379) introduced the feature to handle null value messages, but it only checks the null value in `ConsumerImpl` when `INCOMING_MESSAGES_SIZE_UPDATER` is updated. Therefore, if a partitioned topic with at least 2 partitions was consumed with a null value message, the NPE would be thrown. ### Modifications - Check the null value message in `MultiTopicsConsumerImpl` as well as `ConsumerImpl`. To reduce repeated code, two protected methods are added to `ConsumerBase` and `INCOMING_MESSAGES_SIZE_UPDATER` becomes private now, the derived consumer classes just use these two methods to update or reset `INCOMING_MESSAGES_SIZE_UPDATER`. - Add tests for partitioned topics in `NullValueTest`. Since the existed tests rely on the message send order, here we only send messages to a single partition only. (cherry picked from commit dd3b9d8)
lhotari
reviewed
Jan 11, 2021
pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBase.java
Show resolved
Hide resolved
codelipenghui
added a commit
to codelipenghui/incubator-pulsar
that referenced
this pull request
Jan 12, 2021
codelipenghui
added a commit
that referenced
this pull request
Jan 13, 2021
### Motivation Fix incoming message size issue that introduced in #9113. We should decrease the incoming message size when taking messages from the queue and increase the incoming message size while adding messages to the queue. With #9113, will always increase the incoming queue size. ### Modifications Add method `increaseIncomingSize` and `decreaseIncomingSize` ### Verifying this change Add a new test for verifying the incoming message size should be zero while the incoming queue size is zero.
codelipenghui
added a commit
that referenced
this pull request
Jan 13, 2021
Fix incoming message size issue that introduced in #9113. We should decrease the incoming message size when taking messages from the queue and increase the incoming message size while adding messages to the queue. With #9113, will always increase the incoming queue size. Add method `increaseIncomingSize` and `decreaseIncomingSize` Add a new test for verifying the incoming message size should be zero while the incoming queue size is zero. (cherry picked from commit 2cee0a8)
codelipenghui
added a commit
that referenced
this pull request
Jan 14, 2021
### Motivation Fix incoming message size issue that introduced in #9113. We should decrease the incoming message size when taking messages from the queue and increase the incoming message size while adding messages to the queue. With #9113, will always increase the incoming queue size. ### Modifications Add method `increaseIncomingSize` and `decreaseIncomingSize` ### Verifying this change Add a new test for verifying the incoming message size should be zero while the incoming queue size is zero. (cherry picked from commit 2cee0a8)
freeznet
pushed a commit
to streamnative/pulsar-archived
that referenced
this pull request
Jan 14, 2021
…e#9182) ### Motivation Fix incoming message size issue that introduced in apache#9113. We should decrease the incoming message size when taking messages from the queue and increase the incoming message size while adding messages to the queue. With apache#9113, will always increase the incoming queue size. ### Modifications Add method `increaseIncomingSize` and `decreaseIncomingSize` ### Verifying this change Add a new test for verifying the incoming message size should be zero while the incoming queue size is zero. (cherry picked from commit 2cee0a8)
merlimat
pushed a commit
to merlimat/pulsar
that referenced
this pull request
Apr 6, 2021
…e#9182) ### Motivation Fix incoming message size issue that introduced in apache#9113. We should decrease the incoming message size when taking messages from the queue and increase the incoming message size while adding messages to the queue. With apache#9113, will always increase the incoming queue size. ### Modifications Add method `increaseIncomingSize` and `decreaseIncomingSize` ### Verifying this change Add a new test for verifying the incoming message size should be zero while the incoming queue size is zero.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
#6379 introduced the feature to handle null value messages, but it only checks the null value in
ConsumerImplwhenINCOMING_MESSAGES_SIZE_UPDATERis updated. Therefore, if a partitioned topic with at least 2 partitions was consumed with a null value message, the NPE would be thrown.Modifications
MultiTopicsConsumerImplas well asConsumerImpl. To reduce repeated code, two protected methods are added toConsumerBaseandINCOMING_MESSAGES_SIZE_UPDATERbecomes private now, the derived consumer classes just use these two methods to update or resetINCOMING_MESSAGES_SIZE_UPDATER.NullValueTest. Since the existed tests rely on the message send order, here we only send messages to a single partition only.Verifying this change
This change added tests and can be verified as follows:
NullValueTestfor partitioned topics