svn commit: r1103604 - in /hive/trunk/metastore/src: java/org/apache/hadoop/hive/metastore/ test/org/apache/hadoop/hive/metastore/

[amareshwari]

Author: amareshwari
Date: Mon May 16 04:21:12 2011
New Revision: 1103604

URL: http://svn.apache.org/viewvc?rev=1103604&view=rev
Log:
Remove System.exit from metastore classes. Contributed by Ashutosh Chauhan

Modified:
    
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
    
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
    
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.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=1103604&r1=1103603&r2=1103604&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
 Mon May 16 04:21:12 2011
@@ -539,7 +539,7 @@ public class HiveMetaStore extends Thrif
       if (ms != null) {
         ms.shutdown();
       }
-      System.exit(0);
+      logInfo("Metastore shutdown complete.");
     }
 
     private void create_database_core(RawStore ms, final Database db)
@@ -3149,7 +3149,7 @@ public class HiveMetaStore extends Thrif
   /**
    * @param args
    */
-  public static void main(String[] args) {
+  public static void main(String[] args) throws Throwable{
     int port = 9083;
 
     if (args.length > 0) {
@@ -3158,9 +3158,10 @@ public class HiveMetaStore extends Thrif
     try {
       startMetaStore(port, ShimLoader.getHadoopThriftAuthBridge());
     } catch (Throwable t) {
+      // Catch the exception, log it and rethrow it.
       HMSHandler.LOG
-       .error("Metastore Thrift Server threw an exception. Exiting...");
-      System.exit(1);
+       .error("Metastore Thrift Server threw an exception...",t);
+      throw t;
     }
   }
 

Modified: 
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java?rev=1103604&r1=1103603&r2=1103604&view=diff
==============================================================================
--- 
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
 (original)
+++ 
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
 Mon May 16 04:21:12 2011
@@ -728,11 +728,12 @@ public class MetaStoreUtils {
   public static void startMetaStore(final int port,
       final HadoopThriftAuthBridge bridge) throws Exception {
     Thread thread = new Thread(new Runnable() {
+      @Override
       public void run() {
         try {
           HiveMetaStore.startMetaStore(port, bridge);
         } catch (Throwable e) {
-          System.exit(1);
+          LOG.error("Metastore Thrift Server threw an exception...",e);
         }
       }
     });

Modified: 
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java?rev=1103604&r1=1103603&r2=1103604&view=diff
==============================================================================
--- 
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
 (original)
+++ 
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
 Mon May 16 04:21:12 2011
@@ -53,7 +53,12 @@ public class TestMetaStoreEventListener 
 
     @Override
     public void run() {
-      HiveMetaStore.main(new String[]{msPort});
+      try {
+        HiveMetaStore.main(new String[]{msPort});
+      } catch (Throwable e) {
+        e.printStackTrace(System.err);
+        assert false;
+      }
     }
 
   }

Modified: 
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java?rev=1103604&r1=1103603&r2=1103604&view=diff
==============================================================================
--- 
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java
 (original)
+++ 
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestRemoteHiveMetaStore.java
 Mon May 16 04:21:12 2011
@@ -35,7 +35,12 @@ public class TestRemoteHiveMetaStore ext
 
       @Override
       public void run() {
+        try {
         HiveMetaStore.main(new String[] { METASTORE_PORT });
+        } catch (Throwable e) {
+          e.printStackTrace(System.err);
+          assert false;
+        }
       }
 
     }