You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tu...@apache.org on 2012/05/04 05:21:16 UTC
svn commit: r1333749 -
/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
Author: tucu
Date: Fri May 4 03:21:15 2012
New Revision: 1333749
URL: http://svn.apache.org/viewvc?rev=1333749&view=rev
Log:
Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java?rev=1333749&r1=1333748&r2=1333749&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java (original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java Fri May 4 03:21:15 2012
@@ -33,6 +33,7 @@ import org.apache.hadoop.tools.CopyListi
import org.apache.hadoop.tools.mapred.CopyMapper;
import org.apache.hadoop.tools.mapred.CopyOutputFormat;
import org.apache.hadoop.tools.util.DistCpUtils;
+import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
@@ -49,6 +50,12 @@ import java.util.Random;
* behaviour.
*/
public class DistCp extends Configured implements Tool {
+
+ /**
+ * Priority of the ResourceManager shutdown hook.
+ */
+ public static final int SHUTDOWN_HOOK_PRIORITY = 30;
+
private static final Log LOG = LogFactory.getLog(DistCp.class);
private DistCpOptions inputOptions;
@@ -353,7 +360,8 @@ public class DistCp extends Configured i
DistCp distCp = new DistCp();
Cleanup CLEANUP = new Cleanup(distCp);
- Runtime.getRuntime().addShutdownHook(CLEANUP);
+ ShutdownHookManager.get().addShutdownHook(CLEANUP,
+ SHUTDOWN_HOOK_PRIORITY);
System.exit(ToolRunner.run(getDefaultConf(), distCp, argv));
}
catch (Exception e) {
@@ -388,7 +396,7 @@ public class DistCp extends Configured i
return submitted;
}
- private static class Cleanup extends Thread {
+ private static class Cleanup implements Runnable {
private final DistCp distCp;
public Cleanup(DistCp distCp) {