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

Revert "HADOOP-15850. CopyCommitter#concatFileChunks should check that the blocks per chunk is not 0. Contributed by Ted Yu." 

This reverts commit 437c5187cd.
This commit is contained in:
Wei-Chiu Chuang 2018-10-19 13:33:39 -07:00
parent 437c5187cd
commit 8754c0b65e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
View File

@ -69,7 +69,6 @@ public class CopyCommitter extends FileOutputCommitter {
private boolean overwrite = false; private boolean overwrite = false;
private boolean targetPathExists = true; private boolean targetPathExists = true;
private boolean ignoreFailures = false; private boolean ignoreFailures = false;
private int blocksPerChunk = 0;
/** /**
* Create a output committer * Create a output committer
@ -80,9 +79,6 @@ public class CopyCommitter extends FileOutputCommitter {
*/ */
public CopyCommitter(Path outputPath, TaskAttemptContext context) throws IOException { public CopyCommitter(Path outputPath, TaskAttemptContext context) throws IOException {
super(outputPath, context); super(outputPath, context);
blocksPerChunk = context.getConfiguration().getInt(
DistCpOptionSwitch.BLOCKS_PER_CHUNK.getConfigLabel(), 0);
LOG.debug("blocks per chunk {}", blocksPerChunk);
this.taskAttemptContext = context; this.taskAttemptContext = context;
} }
@ -97,9 +93,7 @@ public class CopyCommitter extends FileOutputCommitter {
ignoreFailures = conf.getBoolean( ignoreFailures = conf.getBoolean(
DistCpOptionSwitch.IGNORE_FAILURES.getConfigLabel(), false); DistCpOptionSwitch.IGNORE_FAILURES.getConfigLabel(), false);
if (blocksPerChunk > 0) { concatFileChunks(conf);
concatFileChunks(conf);
}
super.commitJob(jobContext); super.commitJob(jobContext);

4
hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyCommitter.java
View File

@ -82,6 +82,10 @@ public class TestCopyCommitter {
@Before @Before
public void createMetaFolder() { public void createMetaFolder() {
config.set(DistCpConstants.CONF_LABEL_META_FOLDER, "/meta"); config.set(DistCpConstants.CONF_LABEL_META_FOLDER, "/meta");
// Unset listing file path since the config is shared by
// multiple tests, and some test doesn't set it, such as
// testNoCommitAction, but the distcp code will check it.
config.set(DistCpConstants.CONF_LABEL_LISTING_FILE_PATH, "");
Path meta = new Path("/meta"); Path meta = new Path("/meta");
try { try {
cluster.getFileSystem().mkdirs(meta); cluster.getFileSystem().mkdirs(meta);