Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 9c318f70b -> 7db994458
HDFS-12881. Output streams closed with IOUtils suppressing write errors.
Contributed by Ajay Kumar
(cherry picked from commit 9ae8d1a8de2ffbc8a0082a0089f477d4cefea030)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7db99445
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7db99445
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7db99445
Branch: refs/heads/branch-2.8
Commit: 7db99445884a140c4585c0966309a9f9429d5518
Parents: 9c318f7
Author: Jason Lowe <[email protected]>
Authored: Fri Dec 15 14:47:54 2017 -0600
Committer: Jason Lowe <[email protected]>
Committed: Fri Dec 15 14:57:16 2017 -0600
----------------------------------------------------------------------
.../hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java | 4 +++-
.../apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java | 8 ++++++--
.../tools/offlineImageViewer/TestOfflineImageViewer.java | 6 ++++--
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db99445/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
index ce0f7c0..b40e3f2 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
@@ -1085,8 +1085,10 @@ class FsDatasetImpl implements
FsDatasetSpi<FsVolumeImpl> {
// calculate and write the last crc
checksum.calculateChunkedSums(data, 0, offset, crcs, 0);
metaOut.write(crcs, 0, 4);
+ metaOut.close();
+ metaOut = null;
} finally {
- IOUtils.cleanup(LOG, metaOut);
+ IOUtils.closeStream(metaOut);
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db99445/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java
index 12b5180..9b0723a 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java
@@ -108,6 +108,8 @@ public abstract class FSImageTestUtil {
try {
raf.seek(IMAGE_TXID_POS);
raf.writeLong(0);
+ raf.close();
+ raf = null;
} finally {
IOUtils.closeStream(raf);
}
@@ -542,9 +544,11 @@ public abstract class FSImageTestUtil {
out = new FileOutputStream(versionFile);
props.store(out, null);
-
+ out.close();
+ out = null;
} finally {
- IOUtils.cleanup(null, fis, out);
+ IOUtils.closeStream(fis);
+ IOUtils.closeStream(out);
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7db99445/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
----------------------------------------------------------------------
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
index d921986..073187e 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
@@ -271,9 +271,11 @@ public class TestOfflineImageViewer {
in = new FileInputStream(src);
out = new FileOutputStream(dest);
in.getChannel().transferTo(0, MAX_BYTES, out.getChannel());
+ out.close();
+ out = null;
} finally {
- IOUtils.cleanup(null, in);
- IOUtils.cleanup(null, out);
+ IOUtils.closeStream(in);
+ IOUtils.closeStream(out);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
