HBASE-25596: Fix NPE and avoid permanent unreplicated data due to EOF #2987
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
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
sandeepvinayak
force-pushed
the
HBASE-25596-master
branch
from
4334b6c
to
eb429dc
Compare
|
🎊 +1 overall
This message was automatically generated. |
apurtell
requested changes
Feb 25, 2021
| LOG.trace("Interrupted while sleeping between WAL reads"); | ||
| Thread.currentThread().interrupt(); | ||
| } finally { | ||
| entryStream.close(); |
There was a problem hiding this comment.
See earlier branch-1 review as to why the try blocks have been restructured here. lgtm
| (source.isRecovered() || queue.size() > 1) && this.eofAutoRecovery) { | ||
| if ((e instanceof EOFException || e.getCause() instanceof EOFException) | ||
| && (source.isRecovered() || queue.size() > 1) | ||
| && this.eofAutoRecovery) { | ||
| try { | ||
| if (fs.getFileStatus(queue.peek()).getLen() == 0) { |
There was a problem hiding this comment.
There is a potential race here. queue.peek() is called twice, and can return different results. (There's no guarantee that it won't, right?) A local variable should be assigned just before this line and reused, e.g.
Path head = queue.peek();
if (head != null && fs.getFileStatus(head).getLen() == 0) {
LOG.warn("Forcing removal of 0 length log in queue: {}", head);
...
batch.setLastWalPath(head);
...
}
There was a problem hiding this comment.
@apurtell if this is the case where fs.getFileStatus(queue.peek()).getLen() == 0
it will give the same result because the top of the queue is not going to be removed from anywhere except this handling of an exception. Let me know if it makes sense.
There was a problem hiding this comment.
You can't call peek on a queue twice and be guaranteed the same result. I get what you are saying but please use a local variable as suggested to avoid a code smell. At some future time this could become a real bug.
There was a problem hiding this comment.
Yeah, that makes sense, changing it.
sandeepvinayak
force-pushed
the
HBASE-25596-master
branch
from
5d83d19
to
9991bd9
Compare
|
🎊 +1 overall
This message was automatically generated. |
apurtell
approved these changes
Feb 25, 2021
xcangCRM
approved these changes
Feb 25, 2021
|
🎊 +1 overall
This message was automatically generated. |
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.
@apurtell @xcangCRM This is the porting of #2975 for the master branch.