Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 06d9a245f -> 08fc04801
HDFS-9048. DistCp documentation is out-of-dated (Daisuke Kobayashi via
iwasakims)
(cherry picked from commit 33a412e8a4ab729d588a9576fb7eb90239c6e383)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(cherry picked from commit 55f7ceb0db13a6ef7a29b54f63075ce05dc1b019)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/08fc0480
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/08fc0480
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/08fc0480
Branch: refs/heads/branch-2.7
Commit: 08fc048018ba633d117f9ad488048e26b1b6eb9f
Parents: 06d9a24
Author: Masatake Iwasaki <[email protected]>
Authored: Thu Mar 3 18:57:23 2016 +0900
Committer: Masatake Iwasaki <[email protected]>
Committed: Thu Mar 3 19:00:50 2016 +0900
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop-distcp/src/site/markdown/DistCp.md.vm | 13 +++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/08fc0480/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index a878134..a26a530 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -41,6 +41,9 @@ Release 2.7.3 - UNRELEASED
HDFS-8791. block ID-based DN storage layout can be very slow for datanode
on ext4 (Chris Trezzo via kihwal)
+ HDFS-9048. DistCp documentation is out-of-dated
+ (Daisuke Kobayashi via iwasakims)
+
OPTIMIZATIONS
HDFS-8845. DiskChecker should not traverse the entire tree (Chang Li via
http://git-wip-us.apache.org/repos/asf/hadoop/blob/08fc0480/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
b/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
index 447e515..2f6acb7 100644
--- a/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
+++ b/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
@@ -406,12 +406,13 @@ $H3 Map sizing
$H3 Copying Between Versions of HDFS
- For copying between two different versions of Hadoop, one will usually use
- HftpFileSystem. This is a read-only FileSystem, so DistCp must be run on the
- destination cluster (more specifically, on NodeManagers that can write to the
- destination cluster). Each source is specified as
- `hftp://<dfs.http.address>/<path>` (the default `dfs.http.address` is
- `<namenode>:50070`).
+ For copying between two different major versions of Hadoop (e.g. between 1.X
+ and 2.X), one will usually use WebHdfsFileSystem. Unlike the previous
+ HftpFileSystem, as webhdfs is available for both read and write operations,
+ DistCp can be run on both source and destination cluster.
+ Remote cluster is specified as `webhdfs://<namenode_hostname>:<http_port>`.
+ When copying between same major versions of Hadoop cluster (e.g. between 2.X
+ and 2.X), use hdfs protocol for better performance.
$H3 MapReduce and other side-effects
