Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (revision 1154844) +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (working copy) @@ -577,6 +577,7 @@ RawStore ms = threadLocalMS.get(); if (ms != null) { ms.shutdown(); + ms = null; } logInfo("Metastore shutdown complete."); } Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (revision 1154844) +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (working copy) @@ -77,7 +77,6 @@ private TTransport transport = null; private boolean isConnected = false; private URI metastoreUris[]; - private final boolean standAloneClient = false; private final HiveMetaHookLoader hookLoader; private final HiveConf conf; private String tokenStrForm; @@ -264,15 +263,15 @@ if ((transport != null) && transport.isOpen()) { transport.close(); } - if (standAloneClient) { - try { + try { + if (null != client) { client.shutdown(); - } catch (TException e) { - // TODO:pc cleanup the exceptions - LOG.error("Unable to shutdown local metastore client"); - LOG.error(e.getStackTrace()); - // throw new RuntimeException(e.getMessage()); } + } catch (TException e) { + // TODO:pc cleanup the exceptions + LOG.error("Unable to shutdown local metastore client"); + LOG.error(e.getStackTrace()); + // throw new RuntimeException(e.getMessage()); } } Index: ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (revision 1154844) +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (working copy) @@ -191,6 +191,7 @@ LOG.info("Closing current thread's connection to Hive Metastore."); if (metaStoreClient != null) { metaStoreClient.close(); + metaStoreClient = null; } }