hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: HDFS-10298. Document the usage of distcp -diff option. Contributed by Takashi Ohnishi.
Date Mon, 25 Apr 2016 13:34:51 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 88e1427a0 -> 58642d224

HDFS-10298. Document the usage of distcp -diff option. Contributed by Takashi Ohnishi.

(cherry picked from commit 02c51c27d92e74be7089083555e85da0e73f7fda)

Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/58642d22
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/58642d22
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/58642d22

Branch: refs/heads/branch-2
Commit: 58642d2244c3062672cc8a8b8a7cdbcd8929cd14
Parents: 88e1427
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Mon Apr 25 22:33:09 2016 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Mon Apr 25 22:34:18 2016 +0900

 hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0faa975..12db933 100644
--- a/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
+++ b/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
@@ -234,7 +234,7 @@ Flag              | Description                          | Notes
 `-atomic {-tmp <tmp_dir>}` | Specify atomic commit, with optional tmp directory. |
`-atomic` instructs DistCp to copy the source data to a temporary target location, and then
move the temporary target to the final-location atomically. Data will either be available
at final target in a complete and consistent form, or not at all. Optionally, `-tmp` may be
used to specify the location of the tmp-target. If not specified, a default is chosen. **Note:**
tmp_dir must be on the final target cluster.
 `-mapredSslConf <ssl_conf_file>` | Specify SSL Config file, to be used with HSFTP source
| When using the hsftp protocol with a source, the security- related properties may be specified
in a config-file and passed to DistCp. \<ssl_conf_file\> needs to be in the classpath.
 `-async` | Run DistCp asynchronously. Quits as soon as the Hadoop Job is launched. | The
Hadoop Job-id is logged, for tracking.
-`-diff` | Use snapshot diff report to identify the difference between source and target.
+`-diff <fromSnapshot> <toSnapshot>` | Use snapshot diff report between given
two snapshots to identify the difference between source and target. | This option is valid
only with `-update` option and the following conditions should be satisfied. 1. Both the source
and target FileSystem must be DistributedFileSystem. 2. Two snapshots (e.g., s1 and s2) have
been created on the source FS. The diff between these two snapshots will be copied to the
target FS. 3. The target has the same snapshot s1. No changes have been made on the target
since s1. All the files/directories in the target are the same with source.s1. |
 `-numListstatusThreads` | Number of threads to use for building file listing | At most 40
 `-skipcrccheck` | Whether to skip CRC checks between source and target paths. |

View raw message