big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-15779. EC: fix NPE caused by StripedWriter.clearBuffers during reconstruct block. Contributed by Hongbing Wang

Browse Source 
(cherry picked from commit 15a1f7adfc)
This commit is contained in:
Hui Fei 2021-02-04 09:19:51 +08:00
parent 96773ec81b
commit 164a4e63e0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/erasurecode/StripedWriter.java
View File

@ -296,7 +296,8 @@ boolean hasValidTargets() {
*/ */
void clearBuffers() { void clearBuffers() {
for (StripedBlockWriter writer : writers) { for (StripedBlockWriter writer : writers) {
ByteBuffer targetBuffer = writer.getTargetBuffer(); ByteBuffer targetBuffer =
writer != null ? writer.getTargetBuffer() : null;
if (targetBuffer != null) { if (targetBuffer != null) {
targetBuffer.clear(); targetBuffer.clear();
} }
@ -305,7 +306,8 @@ void clearBuffers() {
void close() { void close() {
for (StripedBlockWriter writer : writers) { for (StripedBlockWriter writer : writers) {
ByteBuffer targetBuffer = writer.getTargetBuffer(); ByteBuffer targetBuffer =
writer != null ? writer.getTargetBuffer() : null;
if (targetBuffer != null) { if (targetBuffer != null) {
reconstructor.freeBuffer(targetBuffer); reconstructor.freeBuffer(targetBuffer);
writer.freeTargetBuffer(); writer.freeTargetBuffer();
@ -313,7 +315,9 @@ void close() {
} }
for (int i = 0; i < targets.length; i++) { for (int i = 0; i < targets.length; i++) {
writers[i].close(); if (writers[i] != null) {
writers[i].close();
}
} }
} }
} }