[Ozone-Streaming] HDDS-6139. Fix incorrect computation of totalAckDataLength. #2978
Conversation
This file contains hidden or 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
szetszwo
reviewed
Jan 12, 2022
Contributor
szetszwo
left a comment
szetszwo
left a comment
There was a problem hiding this comment.
@sadanand48 , the change looks good. Just two minor comments inlined.
| checksum = new Checksum(config.getChecksumType(), | ||
| config.getBytesPerChecksum()); | ||
| metrics = XceiverClientManager.getXceiverClientMetrics(); | ||
| buffersForPutBlock = new ArrayList<>(); |
Contributor
There was a problem hiding this comment.
Remove this line. The list will be created in writeChunk(..).
| keyDataStreamOutput.getStreamEntries().get(0); | ||
| key.write(ByteBuffer.wrap(data)); | ||
| key.close(); | ||
| Assert.assertTrue(stream.getTotalAckDataLength()==dataLength); |
Contributor
There was a problem hiding this comment.
Use assertEquals, i.e.
Assert.assertEquals(dataLength, stream.getTotalAckDataLength());
szetszwo
approved these changes
Jan 13, 2022
Contributor
szetszwo
left a comment
szetszwo
left a comment
There was a problem hiding this comment.
+1 the change looks good.
bshashikant
approved these changes
Jan 13, 2022
Contributor
|
Thanks @sadanand48 for the contribution. |
szetszwo
reviewed
Jan 13, 2022
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java
Show resolved
Hide resolved
szetszwo
pushed a commit
that referenced
this pull request
Jan 20, 2022
captainzmc
pushed a commit
that referenced
this pull request
Feb 9, 2022
szetszwo
pushed a commit
that referenced
this pull request
Feb 16, 2022
szetszwo
pushed a commit
that referenced
this pull request
Mar 15, 2022
szetszwo
pushed a commit
that referenced
this pull request
Mar 24, 2022
szetszwo
pushed a commit
to szetszwo/ozone
that referenced
this pull request
May 6, 2022
szetszwo
pushed a commit
that referenced
this pull request
May 13, 2022
szetszwo
pushed a commit
that referenced
this pull request
May 24, 2022
szetszwo
pushed a commit
that referenced
this pull request
Jun 9, 2022
captainzmc
pushed a commit
to captainzmc/hadoop-ozone
that referenced
this pull request
Jul 4, 2022
szetszwo
pushed a commit
that referenced
this pull request
Nov 7, 2022
nishitpatira
pushed a commit
to nishitpatira/ozone
that referenced
this pull request
Dec 16, 2022
…aLength. (apache#2978) (cherry picked from commit 156cd46)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What changes were proposed in this pull request?
In the current streaming code we maintain only one bufferList for retry. Buffers in the list are removed only during watchForCommit. So there might occur a case if putBlock is followed by another putBlock the commitInfoMap has the same list for both indexes which will cause incorrect computation of totalAckDatalength which is used during retry
What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-6139
How was this patch tested?
unit test