PIG-4916: Pig on Tez fail to remove temporary HDFS files in some cases

git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1747087 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 3b27f37..7152e49 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -30,6 +30,8 @@
  
 BUG FIXES
 
+PIG-4916: Pig on Tez fail to remove temporary HDFS files in some cases (daijy)
+
 Release 0.16.0 - Unreleased
 
 INCOMPATIBLE CHANGES
diff --git a/src/org/apache/pig/Main.java b/src/org/apache/pig/Main.java
index 0f84ffc..7536dbc 100644
--- a/src/org/apache/pig/Main.java
+++ b/src/org/apache/pig/Main.java
@@ -53,8 +53,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.GenericOptionsParser;
+import org.apache.hadoop.util.ShutdownHookManager;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
@@ -100,13 +102,13 @@
 public class Main {
 
     static {
-        Runtime.getRuntime().addShutdownHook(new Thread() {
 
+        ShutdownHookManager.get().addShutdownHook(new Runnable() {
             @Override
             public void run() {
                 FileLocalizer.deleteTempResourceFiles();
             }
-        });
+        }, FileSystem.SHUTDOWN_HOOK_PRIORITY + 1);
     }
 
     private final static Log log = LogFactory.getLog(Main.class);