Repository: hive
Updated Branches:
  refs/heads/branch-1.2 4d442169c -> 6a4a75680


HIVE-10443: HIVE-9870 broke hadoop-1 build (Vaibhav Gumashta reviewed by 
Prasanth Jayachandran)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6a4a7568
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6a4a7568
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6a4a7568

Branch: refs/heads/branch-1.2
Commit: 6a4a756803a9455acea3efebef610b0adcbc9379
Parents: 4d44216
Author: Prasanth Jayachandran <[email protected]>
Authored: Sun Apr 26 14:23:41 2015 -0700
Committer: Prasanth Jayachandran <[email protected]>
Committed: Sun Apr 26 14:23:41 2015 -0700

----------------------------------------------------------------------
 .../org/apache/hive/service/server/HiveServer2.java   | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/6a4a7568/service/src/java/org/apache/hive/service/server/HiveServer2.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/server/HiveServer2.java 
b/service/src/java/org/apache/hive/service/server/HiveServer2.java
index 01251c3..222cb45 100644
--- a/service/src/java/org/apache/hive/service/server/HiveServer2.java
+++ b/service/src/java/org/apache/hive/service/server/HiveServer2.java
@@ -297,18 +297,6 @@ public class HiveServer2 extends CompositeService {
     }
   }
 
-  private static void startPauseMonitor(HiveConf conf) throws Exception {
-    try {
-      Class.forName("org.apache.hadoop.util.JvmPauseMonitor");
-      org.apache.hadoop.util.JvmPauseMonitor pauseMonitor =
-        new org.apache.hadoop.util.JvmPauseMonitor(conf);
-      pauseMonitor.start();
-    } catch (Throwable t) {
-      LOG.warn("Could not initiate the JvmPauseMonitor thread." +
-               " GCs and Pauses may not be warned upon.", t);
-    }
-  }
-
   private static void startHiveServer2() throws Throwable {
     long attempts = 0, maxAttempts = 1;
     while (true) {
@@ -320,7 +308,7 @@ public class HiveServer2 extends CompositeService {
         server = new HiveServer2();
         server.init(hiveConf);
         server.start();
-        startPauseMonitor(hiveConf);
+        ShimLoader.getHadoopShims().startPauseMonitor(hiveConf);
         // If we're supporting dynamic service discovery, we'll add the 
service uri for this
         // HiveServer2 instance to Zookeeper as a znode.
         if 
(hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_SUPPORT_DYNAMIC_SERVICE_DISCOVERY)) {

Reply via email to