Repository: hadoop Updated Branches: refs/heads/trunk a963baba1 -> ba1c9d484
HDFS-9764. DistCp doesn't print value for several arguments including -numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba1c9d48 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba1c9d48 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba1c9d48 Branch: refs/heads/trunk Commit: ba1c9d484a8d6a18b4b7365c49d09635d24e579a Parents: a963bab Author: Yongjun Zhang <[email protected]> Authored: Fri Feb 19 10:17:37 2016 -0800 Committer: Yongjun Zhang <[email protected]> Committed: Fri Feb 19 10:17:37 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/tools/DistCpOptions.java | 10 +++++++++- .../org/apache/hadoop/tools/TestOptionsParser.java | 15 ++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba1c9d48/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 2129a69..1f5d65d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1942,6 +1942,9 @@ Release 2.8.0 - UNRELEASED HDFS-8923. Add -source flag to balancer usage message. (Chris Trezzo via szetszwo) + HDFS-9764. DistCp doesn't print value for several arguments including + -numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba1c9d48/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java index 10cf388..cbd4ac0 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpOptions.java @@ -664,14 +664,22 @@ public class DistCpOptions { ", syncFolder=" + syncFolder + ", deleteMissing=" + deleteMissing + ", ignoreFailures=" + ignoreFailures + + ", overwrite=" + overwrite + + ", skipCRC=" + skipCRC + + ", blocking=" + blocking + + ", numListstatusThreads=" + numListstatusThreads + ", maxMaps=" + maxMaps + + ", mapBandwidth=" + mapBandwidth + ", sslConfigurationFile='" + sslConfigurationFile + '\'' + ", copyStrategy='" + copyStrategy + '\'' + + ", preserveStatus=" + preserveStatus + + ", preserveRawXattrs=" + preserveRawXattrs + + ", atomicWorkPath=" + atomicWorkPath + + ", logPath=" + logPath + ", sourceFileListing=" + sourceFileListing + ", sourcePaths=" + sourcePaths + ", targetPath=" + targetPath + ", targetPathExists=" + targetPathExists + - ", preserveRawXattrs=" + preserveRawXattrs + ", filtersFile='" + filtersFile + '\'' + '}'; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba1c9d48/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java index 78ae415..4c136a8 100644 --- a/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java +++ b/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java @@ -399,11 +399,16 @@ public class TestOptionsParser { @Test public void testToString() { DistCpOptions option = new DistCpOptions(new Path("abc"), new Path("xyz")); - String val = "DistCpOptions{atomicCommit=false, syncFolder=false, deleteMissing=false, " + - "ignoreFailures=false, maxMaps=20, sslConfigurationFile='null', copyStrategy='uniformsize', " + - "sourceFileListing=abc, sourcePaths=null, targetPath=xyz, targetPathExists=true, " + - "preserveRawXattrs=false, filtersFile='null'}"; - Assert.assertEquals(val, option.toString()); + String val = "DistCpOptions{atomicCommit=false, syncFolder=false, " + + "deleteMissing=false, ignoreFailures=false, overwrite=false, " + + "skipCRC=false, blocking=true, numListstatusThreads=0, maxMaps=20, " + + "mapBandwidth=100.0, sslConfigurationFile='null', " + + "copyStrategy='uniformsize', preserveStatus=[], " + + "preserveRawXattrs=false, atomicWorkPath=null, logPath=null, " + + "sourceFileListing=abc, sourcePaths=null, targetPath=xyz, " + + "targetPathExists=true, filtersFile='null'}"; + String optionString = option.toString(); + Assert.assertEquals(val, optionString); Assert.assertNotSame(DistCpOptionSwitch.ATOMIC_COMMIT.toString(), DistCpOptionSwitch.ATOMIC_COMMIT.name()); }
