Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HADOOP-8143. Change distcp to have -pb on by default." 

This reverts commit dd65eea74b.

Change-Id: I74180cf59d5bbad8c9f66cb331535addcbea863e
This commit is contained in:
Steve Loughran 2020-05-14 16:06:24 +01:00
parent 31c1a24426
commit cb94911252
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/OptionsParser.java
View File

@ -189,9 +189,6 @@ public class OptionsParser {
if (command.hasOption(DistCpOptionSwitch.PRESERVE_STATUS.getSwitch())) { if (command.hasOption(DistCpOptionSwitch.PRESERVE_STATUS.getSwitch())) {
builder.preserve( builder.preserve(
getVal(command, DistCpOptionSwitch.PRESERVE_STATUS.getSwitch())); getVal(command, DistCpOptionSwitch.PRESERVE_STATUS.getSwitch()));
} else {
// No "preserve" settings specified. Preserve block-size.
builder.preserve(DistCpOptions.FileAttribute.BLOCKSIZE);
} }
if (command.hasOption(DistCpOptionSwitch.FILE_LIMIT.getSwitch())) { if (command.hasOption(DistCpOptionSwitch.FILE_LIMIT.getSwitch())) {

2
hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestOptionsParser.java
View File

@ -413,7 +413,7 @@ public class TestOptionsParser {
"-f", "-f",
"hdfs://localhost:8020/source/first", "hdfs://localhost:8020/source/first",
"hdfs://localhost:8020/target/"}); "hdfs://localhost:8020/target/"});
Assert.assertTrue(options.shouldPreserve(FileAttribute.BLOCKSIZE)); Assert.assertFalse(options.shouldPreserve(FileAttribute.BLOCKSIZE));
Assert.assertFalse(options.shouldPreserve(FileAttribute.REPLICATION)); Assert.assertFalse(options.shouldPreserve(FileAttribute.REPLICATION));
Assert.assertFalse(options.shouldPreserve(FileAttribute.PERMISSION)); Assert.assertFalse(options.shouldPreserve(FileAttribute.PERMISSION));
Assert.assertFalse(options.shouldPreserve(FileAttribute.USER)); Assert.assertFalse(options.shouldPreserve(FileAttribute.USER));