Skip to content

HADOOP-18635 : Expose distcp counters to user via new DistCpConstants "CONF_LABEL_DI… #5402

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

Closed
wants to merge 4 commits into from
Closed

HADOOP-18635 : Expose distcp counters to user via new DistCpConstants "CONF_LABEL_DI… #5402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3dcbd6
Expose distcp counters to user via new DistCpConstants "CONF_LABEL_DI…
atsaonerk Feb 15, 2023
2bce2f6
Add testcase to test bytes copied config is actually returned to user…
atsaonerk Feb 16, 2023
3b45742
Corrected code validation failures.
atsaonerk Feb 17, 2023
15669c1
Fixed TestExternalCall.testcleanupOfJob failure.
atsaonerk Feb 23, 2023
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
10 changes: 10 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 @@ -153,6 +153,14 @@ public int run(String[] argv) {
Job job = null;
try {
job = execute();
if (job != null) {
Long bytesCopied = job.getCounters().
findCounter(CopyMapper.Counter.BYTESCOPIED).getValue();
LOG.info("distcp copied {} number of bytes", bytesCopied);
//Set the config label so that consumer such as hive can see this distcp counter
getConf().set(DistCpConstants.CONF_LABEL_DISTCP_TOTAL_BYTES_COPIED,
String.valueOf(bytesCopied));
}
} catch (InvalidInputException e) {
LOG.error("Invalid input: ", e);
return DistCpConstants.INVALID_ARGUMENT;
Expand All @@ -165,6 +173,8 @@ public int run(String[] argv) {
} catch (XAttrsNotSupportedException e) {
LOG.error("XAttrs not supported on at least one file system: ", e);
return DistCpConstants.XATTRS_NOT_SUPPORTED;
} catch (IOException e) {
LOG.error("Exception encountered while retrieving distcp counter from job", e);
} catch (Exception e) {
LOG.error("Exception encountered ", e);
return DistCpConstants.UNKNOWN_ERROR;
Expand Down
5 changes: 5 additions & 0 deletions hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ private DistCpConstants() {
*/
public static final String CONF_LABEL_DISTCP_JOB_ID = "distcp.job.id";

/**
* DistCp Counter for consumers of the Distcp.
*/
public static final String CONF_LABEL_DISTCP_TOTAL_BYTES_COPIED = "distcp.total.bytes.copied";

/* Meta folder where the job's intermediate data is kept */
public static final String CONF_LABEL_META_FOLDER = "distcp.meta.folder";

Expand Down
9 changes: 8 additions & 1 deletion hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpSystem.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;

import static org.apache.hadoop.test.GenericTestUtils.getMethodName;
import static org.apache.hadoop.tools.DistCpConstants.CONF_LABEL_DISTCP_TOTAL_BYTES_COPIED;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
Expand All @@ -32,6 +33,7 @@
import java.util.List;
import java.util.Random;

import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.conf.Configuration;
Expand Down Expand Up @@ -452,7 +454,12 @@ public void testDistcpLargeFile() throws Exception {
};

LOG.info("_____ running distcp: " + args[0] + " " + args[1]);
ToolRunner.run(conf, new DistCp(), args);
DistCp distcpTool = new DistCp();
ToolRunner.run(conf, distcpTool, args);
final long bytesCopied = NumberUtils.toLong(distcpTool.getConf().
get(CONF_LABEL_DISTCP_TOTAL_BYTES_COPIED), 0);
assertEquals("Bytes copied by distcp tool does not match source file length",
srcLen, bytesCopied);

String realTgtPath = testDst;
FileStatus[] dststat = getFileStatus(fs, realTgtPath, srcfiles);
Expand Down