Skip to content

HADOOP-17594. DistCp: Expose the JobId for applications executing through run method #2786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ayushtkn merged 3 commits into from
Mar 19, 2021
Merged

HADOOP-17594. DistCp: Expose the JobId for applications executing through run method #2786

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81db9bc
HADOOP-17594. DistCp: Expose the JobId for applications executing thr…
ayushtkn Mar 18, 2021
bf3817c
Fix Checkstyle.
ayushtkn Mar 18, 2021
b756b3d
Move Import Above.
ayushtkn Mar 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ public Job createAndSubmitJob() throws Exception {
String jobID = job.getJobID().toString();
job.getConfiguration().set(DistCpConstants.CONF_LABEL_DISTCP_JOB_ID,
jobID);
// Set the jobId for the applications running through run method.
getConf().set(DistCpConstants.CONF_LABEL_DISTCP_JOB_ID, jobID);
LOG.info("DistCp job-id: " + jobID);

return job;
Expand Down
13 changes: 13 additions & 0 deletions ...oop-distcp/src/test/java/org/apache/hadoop/tools/contract/AbstractContractDistCpTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.hadoop.tools.contract;

import static org.apache.hadoop.fs.contract.ContractTestUtils.*;
import static org.apache.hadoop.tools.DistCpConstants.CONF_LABEL_DISTCP_JOB_ID;

import java.io.IOException;
import java.util.Collections;
Expand All @@ -43,6 +44,7 @@
import org.apache.hadoop.tools.DistCpOptions;
import org.apache.hadoop.tools.mapred.CopyMapper;

import org.apache.hadoop.tools.util.DistCpTestUtils;
Copy link
Contributor

@steveloughran steveloughran Mar 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move to hadoop block

import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -464,6 +466,17 @@ public void testLargeFilesFromRemote() throws Exception {
largeFiles(remoteFS, remoteDir, localFS, localDir);
}

@Test
public void testSetJobId() throws Exception {
describe("check jobId is set in the conf");
remoteFS.create(new Path(remoteDir, "file1")).close();
DistCpTestUtils
.assertRunDistCp(DistCpConstants.SUCCESS, remoteDir.toString(),
localDir.toString(), null, conf);
assertNotNull("DistCp job id isn't set",
conf.get(CONF_LABEL_DISTCP_JOB_ID));
}

/**
* Executes a DistCp using a file system sub-tree with multiple nesting
* levels.
Expand Down