hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From surendralilh...@apache.org
Subject hadoop git commit: HDFS-12833. Distcp : Update the usage of delete option for dependency with update and overwrite option. Contributed by usharani.
Date Wed, 13 Dec 2017 05:24:06 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.9 dff710632 -> 4f0ae1b10


HDFS-12833. Distcp : Update the usage of delete option for dependency with update and overwrite
option. Contributed by usharani.

(cherry picked from commit 8d69b7f2d41e6a76c8c706ead21b1abe86592881)


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

Branch: refs/heads/branch-2.9
Commit: 4f0ae1b1082c5d34a75511af80b6abded2d3d667
Parents: dff7106
Author: Surendra Singh Lilhore <surendralilhore@apache.org>
Authored: Wed Dec 13 10:29:19 2017 +0530
Committer: Surendra Singh Lilhore <surendralilhore@apache.org>
Committed: Wed Dec 13 10:50:01 2017 +0530

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java | 3 ++-
 hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f0ae1b1/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
index 2da826b..56362e2 100644
--- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
+++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptionSwitch.java
@@ -73,7 +73,8 @@ public enum DistCpOptionSwitch {
    */
   DELETE_MISSING(DistCpConstants.CONF_LABEL_DELETE_MISSING,
       new Option("delete", false, "Delete from target, " +
-          "files missing in source")),
+          "files missing in source. Delete is applicable only"
+          + " with update or overwrite options")),
 
   /**
    * Configuration file to use with hftps:// for securely copying

http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f0ae1b1/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 3387281..302b743 100644
--- a/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
+++ b/hadoop-tools/hadoop-distcp/src/site/markdown/DistCp.md.vm
@@ -230,7 +230,7 @@ Flag              | Description                          | Notes
 `-filters` | The path to a file containing a list of pattern strings, one string per line,
such that paths matching the pattern will be excluded from the copy. | Support regular expressions
specified by java.util.regex.Pattern.
 `-filelimit <n>` | Limit the total number of files to be <= n | **Deprecated!**
Ignored in the new DistCp.
 `-sizelimit <n>` | Limit the total size to be <= n bytes | **Deprecated!** Ignored
in the new DistCp.
-`-delete` | Delete the files existing in the dst but not in src | The deletion is done by
FS Shell. So the trash will be used, if it is enable.
+`-delete` | Delete the files existing in the dst but not in src | The deletion is done by
FS Shell. So the trash will be used, if it is enable. Delete is applicable only with update
or overwrite options.
 `-strategy {dynamic|uniformsize}` | Choose the copy-strategy to be used in DistCp. | By default,
uniformsize is used. (i.e. Maps are balanced on the total size of files copied by each map.
Similar to legacy.) If "dynamic" is specified, `DynamicInputFormat` is used instead. (This
is described in the Architecture section, under InputFormats.)
 `-bandwidth` | Specify bandwidth per map, in MB/second. | Each map will be restricted to
consume only the specified bandwidth. This is not always exact. The map throttles back its
bandwidth consumption during a copy, such that the **net** bandwidth used tends towards the
specified value.
 `-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.


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message