You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/05/28 04:56:27 UTC
svn commit: r1597920 -
/hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
Author: hashutosh
Date: Wed May 28 02:56:26 2014
New Revision: 1597920
URL: http://svn.apache.org/r1597920
Log:
HIVE-6313 : Minimr tests in hadoop-1 hangs on shutdown (Navis via Ashutosh Chauhan)
Modified:
hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
Modified: hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java?rev=1597920&r1=1597919&r2=1597920&view=diff
==============================================================================
--- hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java (original)
+++ hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java Wed May 28 02:56:26 2014
@@ -23,7 +23,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Iterator;
import java.net.URI;
import java.util.HashMap;
import java.util.List;
@@ -41,9 +40,8 @@ import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.fs.ProxyFileSystem;
import org.apache.hadoop.fs.Trash;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.hadoop.hive.shims.HadoopShims.DirectDecompressorShim;
import org.apache.hadoop.io.LongWritable;
-import org.apache.hadoop.io.compress.CompressionCodec;
+import org.apache.hadoop.mapred.JobInProgress;
import org.apache.hadoop.mapred.JobTracker;
import org.apache.hadoop.mapred.MiniMRCluster;
import org.apache.hadoop.mapred.ClusterStatus;
@@ -204,7 +202,18 @@ public class Hadoop20SShims extends Hado
@Override
public void shutdown() throws IOException {
- mr.shutdown();
+ MiniMRCluster.JobTrackerRunner runner = mr.getJobTrackerRunner();
+ JobTracker tracker = runner.getJobTracker();
+ if (tracker != null) {
+ for (JobInProgress running : tracker.getRunningJobs()) {
+ try {
+ running.kill();
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+ runner.shutdown();
}
@Override