hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgumas...@apache.org
Subject svn commit: r1673923 - in /hive/trunk: metastore/src/java/org/apache/hadoop/hive/metastore/ shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/ shims/0.23/src/main/java/org/apache/hadoop/hive/shims/ shims/common/src/main/java/org/apache/hadoop/hive...
Date Wed, 15 Apr 2015 18:36:13 GMT
Author: vgumashta
Date: Wed Apr 15 18:36:13 2015
New Revision: 1673923

URL: http://svn.apache.org/r1673923
Log:
HIVE-10269: HiveMetaStore.java:[6089,29] cannot find symbol class JvmPauseMonitor (Ferdinand
Xu reviewed by Vaibhav Gumashta)

Modified:
    hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/trunk/shims/0.20S/src/main/java/org/apache/hadoop/hive/shims/Hadoop20SShims.java
    hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
    hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java

Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1673923&r1=1673922&r2=1673923&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Wed
Apr 15 18:36:13 2015
@@ -6059,11 +6059,8 @@ public class HiveMetaStore extends Thrif
         // Wrap the start of the threads in a catch Throwable loop so that any failures
         // don't doom the rest of the metastore.
         startLock.lock();
-        try {
-          startPauseMonitor(conf);
-        } catch (Throwable t) {
-          LOG.warn("Error starting the JVM pause monitor", t);
-        }
+        ShimLoader.getHadoopShims().startPauseMonitor(conf);
+
         try {
           // Per the javadocs on Condition, do not depend on the condition alone as a start
gate
           // since spurious wake ups are possible.
@@ -6083,18 +6080,6 @@ public class HiveMetaStore extends Thrif
     t.start();
   }
 
-  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 startCompactorInitiator(HiveConf conf) throws Exception {
     if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_COMPACTOR_INITIATOR_ON)) {
       MetaStoreThread initiator =

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=1673923&r1=1673922&r2=1673923&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 Apr 15 18:36:13 2015
@@ -156,6 +156,11 @@ public class Hadoop20SShims extends Hado
   }
 
   @Override
+  public void startPauseMonitor(Configuration conf) {
+    /* no supported */
+  }
+
+  @Override
   public boolean isLocalMode(Configuration conf) {
     return "local".equals(getJobLauncherRpcAddress(conf));
   }

Modified: hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java?rev=1673923&r1=1673922&r2=1673923&view=diff
==============================================================================
--- hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java (original)
+++ hive/trunk/shims/0.23/src/main/java/org/apache/hadoop/hive/shims/Hadoop23Shims.java Wed
Apr 15 18:36:13 2015
@@ -210,6 +210,19 @@ public class Hadoop23Shims extends Hadoo
   }
 
   @Override
+  public void startPauseMonitor(Configuration conf) {
+    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);
+    }
+  }
+
+  @Override
   public boolean isLocalMode(Configuration conf) {
     return "local".equals(conf.get("mapreduce.framework.name"));
   }

Modified: hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java?rev=1673923&r1=1673922&r2=1673923&view=diff
==============================================================================
--- hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java (original)
+++ hive/trunk/shims/common/src/main/java/org/apache/hadoop/hive/shims/HadoopShims.java Wed
Apr 15 18:36:13 2015
@@ -144,6 +144,8 @@ public interface HadoopShims {
 
   public JobContext newJobContext(Job job);
 
+  public void startPauseMonitor(Configuration conf);
+
   /**
    * Check wether MR is configured to run in local-mode
    * @param conf



Mime
View raw message