HIVE-2937. TestHiveServerSessions hangs when executed directly. (navis via kevinwilfong)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1325830 13f79535-47bb-0310-9956-ffa450edef68

Author: Kevin Wilfong

metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java

@@ -382,21 +382,22 @@ private void createDefaultDB_core(RawStore ms) throws MetaException, InvalidObje
      * @throws MetaException
      */
     private void createDefaultDB() throws MetaException {
-      if (HMSHandler.createDefaultDB || !checkForDefaultDb) {
-        return;
-      }
+      synchronized (HMSHandler.class) {
+        if (HMSHandler.createDefaultDB || !checkForDefaultDb) {
+          return;
+        }
 
-      try {
-        createDefaultDB_core(getMS());
-      } catch (InvalidObjectException e) {
-        throw new MetaException(e.getMessage());
-      } catch (MetaException e) {
-        throw e;
-      } catch (Exception e) {
-        assert (e instanceof RuntimeException);
-        throw (RuntimeException) e;
+        try {
+          createDefaultDB_core(getMS());
+        } catch (InvalidObjectException e) {
+          throw new MetaException(e.getMessage());
+        } catch (MetaException e) {
+          throw e;
+        } catch (Exception e) {
+          assert (e instanceof RuntimeException);
+          throw (RuntimeException) e;
+        }
       }
-
     }
 
     private void logInfo(String m) {

service/src/java/org/apache/hadoop/hive/service/HiveServer.java

@@ -152,11 +152,11 @@ private void setupSessionIO(SessionState session) {
           session.in = null;
           session.out = new PrintStream(System.out, true, "UTF-8");
           session.err = new PrintStream(System.err, true, "UTF-8");
-      	  } catch (UnsupportedEncodingException ee) {
-      	    ee.printStackTrace();
-      	    session.out = null;
-      	    session.err = null;
-      	  }
+        } catch (UnsupportedEncodingException ee) {
+          ee.printStackTrace();
+          session.out = null;
+          session.err = null;
+        }
       }
     }
 
@@ -545,11 +545,14 @@ public ThriftHiveProcessorFactory(TProcessor processor, HiveConf conf) {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public TProcessor getProcessor(TTransport trans) {
       try {
         Iface handler = new HiveServerHandler(new HiveConf(conf));
         return new ThriftHive.Processor(handler);
       } catch (Exception e) {
+        HiveServerHandler.LOG.warn("Failed to get processor by exception " + e, e);
+        trans.close();
         throw new RuntimeException(e);
       }
     }