Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (revision 1096871) +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (working copy) @@ -523,7 +523,7 @@ if (ms != null) { ms.shutdown(); } - System.exit(0); + logInfo("Metastore shutdown complete."); } private void create_database_core(RawStore ms, final Database db) @@ -3126,8 +3126,7 @@ startMetaStore(port, ShimLoader.getHadoopThriftAuthBridge()); } catch (Throwable t) { HMSHandler.LOG - .error("Metastore Thrift Server threw an exception. Exiting..."); - System.exit(1); + .error("Metastore Thrift Server threw an exception. Exiting...",t); } } Index: metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (revision 1096871) +++ metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (working copy) @@ -731,7 +731,7 @@ try { HiveMetaStore.startMetaStore(port, bridge); } catch (Throwable e) { - System.exit(1); + LOG.error("Metastore Thrift Server threw an exception. Exiting...",e); } } });