HDFS-5825. Merging r1561792 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561793 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
be32b2d1ad
commit
8b1c7bafab
|
@ -696,6 +696,9 @@ Release 2.3.0 - UNRELEASED
|
||||||
HADOOP-10086. User document for authentication in secure cluster.
|
HADOOP-10086. User document for authentication in secure cluster.
|
||||||
(Masatake Iwasaki via Arpit Agarwal)
|
(Masatake Iwasaki via Arpit Agarwal)
|
||||||
|
|
||||||
|
HDFS-5825. Use FileUtils.copyFile() to implement DFSTestUtils.copyFile().
|
||||||
|
(Haohui Mai via Arpit Agarwal)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
BUG FIXES
|
BUG FIXES
|
||||||
|
|
|
@ -20,6 +20,8 @@ package org.apache.hadoop.hdfs;
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import com.google.common.base.Joiner;
|
import com.google.common.base.Joiner;
|
||||||
|
|
||||||
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
@ -27,7 +29,6 @@ import org.apache.hadoop.fs.*;
|
||||||
import org.apache.hadoop.fs.FileSystem;
|
import org.apache.hadoop.fs.FileSystem;
|
||||||
import org.apache.hadoop.fs.FileSystem.Statistics;
|
import org.apache.hadoop.fs.FileSystem.Statistics;
|
||||||
import org.apache.hadoop.fs.Options.Rename;
|
import org.apache.hadoop.fs.Options.Rename;
|
||||||
import org.apache.hadoop.fs.Path;
|
|
||||||
import org.apache.hadoop.fs.permission.FsPermission;
|
import org.apache.hadoop.fs.permission.FsPermission;
|
||||||
import org.apache.hadoop.hdfs.MiniDFSCluster.NameNodeInfo;
|
import org.apache.hadoop.hdfs.MiniDFSCluster.NameNodeInfo;
|
||||||
import org.apache.hadoop.hdfs.client.HdfsDataInputStream;
|
import org.apache.hadoop.hdfs.client.HdfsDataInputStream;
|
||||||
|
@ -909,21 +910,7 @@ public class DFSTestUtil {
|
||||||
|
|
||||||
/** Copy one file's contents into the other **/
|
/** Copy one file's contents into the other **/
|
||||||
public static void copyFile(File src, File dest) throws IOException {
|
public static void copyFile(File src, File dest) throws IOException {
|
||||||
InputStream in = null;
|
FileUtils.copyFile(src, dest);
|
||||||
OutputStream out = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
in = new FileInputStream(src);
|
|
||||||
out = new FileOutputStream(dest);
|
|
||||||
|
|
||||||
byte [] b = new byte[1024];
|
|
||||||
while( in.read(b) > 0 ) {
|
|
||||||
out.write(b);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
if(in != null) in.close();
|
|
||||||
if(out != null) out.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Builder {
|
public static class Builder {
|
||||||
|
|
Loading…
Reference in New Issue