You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2017/12/14 15:53:39 UTC
hadoop git commit: HDFS-12881. Output streams closed with IOUtils
suppressing write errors. Contributed by Ajay Kumar
Repository: hadoop
Updated Branches:
refs/heads/trunk 2564b4d07 -> 80db744ee
HDFS-12881. Output streams closed with IOUtils suppressing write errors. Contributed by Ajay Kumar
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/80db744e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/80db744e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/80db744e
Branch: refs/heads/trunk
Commit: 80db744ee57c52a1dc306c576c663ccc76cced4c
Parents: 2564b4d
Author: Jason Lowe <jl...@apache.org>
Authored: Thu Dec 14 09:45:44 2017 -0600
Committer: Jason Lowe <jl...@apache.org>
Committed: Thu Dec 14 09:45:44 2017 -0600
----------------------------------------------------------------------
.../hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java | 4 +++-
.../apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java | 7 ++++++-
.../hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java | 6 ++++--
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/80db744e/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 d4375cd..095bc8f 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
@@ -1086,8 +1086,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(null, metaOut);
+ IOUtils.closeStream(metaOut);
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/80db744e/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 1256eb1..7be645f 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,12 @@ 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/80db744e/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 5111265..7574cbf 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
@@ -340,9 +340,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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org