Author: umamahesh
Date: Thu Jun 12 11:07:22 2014
New Revision: 1602119
URL: http://svn.apache.org/r1602119
Log:
Merge from trunk to branch-2. MAPREDUCE-5920. Add Xattr option in DistCp docs.
Contributed by Yi Liu.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1601983
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1602119&r1=1602118&r2=1602119&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu
Jun 12 11:07:22 2014
@@ -117,6 +117,8 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5898. distcp to support preserving HDFS extended
attributes(XAttrs)
(Yi Liu via umamahesh)
+ MAPREDUCE-5920. Add Xattr option in DistCp docs. (Yi Liu via cnauroth)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1601983
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm?rev=1602119&r1=1602118&r2=1602119&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/DistCp.md.vm
Thu Jun 12 11:07:22 2014
@@ -196,7 +196,7 @@ Command Line Options
Flag | Description | Notes
----------------- | ------------------------------------ | --------
-`-p[rbugpca]` | Preserve r: replication number b: block size u: user g: group
p: permission c: checksum-type a: ACL | Modification times are not preserved.
Also, when `-update` is specified, status updates will **not** be synchronized
unless the file sizes also differ (i.e. unless the file is re-created). If -pa
is specified, DistCp preserves the permissions also because ACLs are a
super-set of permissions.
+`-p[rbugpcax]` | Preserve r: replication number b: block size u: user g: group
p: permission c: checksum-type a: ACL x: XAttr | Modification times are not
preserved. Also, when `-update` is specified, status updates will **not** be
synchronized unless the file sizes also differ (i.e. unless the file is
re-created). If -pa is specified, DistCp preserves the permissions also because
ACLs are a super-set of permissions.
`-i` | Ignore failures | As explained in the Appendix, this option will keep
more accurate statistics about the copy than the default case. It also
preserves logs from failed copies, which can be valuable for debugging.
Finally, a failing map will not cause the job to fail before all splits are
attempted.
`-log <logdir>` | Write logs to \<logdir\> | DistCp keeps logs of each file it
attempts to copy as map output. If a map fails, the log output will not be
retained if it is re-executed.
`-m <num_maps>` | Maximum number of simultaneous copies | Specify the number
of maps to copy data. Note that more maps may not necessarily improve
throughput.
