Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java =================================================================== --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (revision 1098025) +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (working copy) @@ -290,18 +290,12 @@ T ret = null; boolean gotNewConnectUrl = false; - boolean reloadConf = HiveConf.getBoolVar(hiveConf, - HiveConf.ConfVars.METASTOREFORCERELOADCONF); - if (reloadConf) { - updateConnectionURL(getConf(), null); - } - int retryCount = 0; Exception caughtException = null; while(true) { try { - RawStore ms = getMS(reloadConf || gotNewConnectUrl); + RawStore ms = getMS(gotNewConnectUrl); ret = cmd.run(ms); break; } catch (javax.jdo.JDOException e) { Index: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java =================================================================== --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (revision 1098025) +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (working copy) @@ -62,7 +62,6 @@ HiveConf.ConfVars.METASTORECONNECTURLKEY, HiveConf.ConfVars.METASTOREATTEMPTS, HiveConf.ConfVars.METASTOREINTERVAL, - HiveConf.ConfVars.METASTOREFORCERELOADCONF, HiveConf.ConfVars.METASTORESERVERMINTHREADS, HiveConf.ConfVars.METASTORESERVERMAXTHREADS, HiveConf.ConfVars.METASTORE_TCP_KEEP_ALIVE, @@ -182,11 +181,6 @@ METASTOREATTEMPTS("hive.metastore.ds.retry.attempts", 1), // Number of miliseconds to wait between attepting METASTOREINTERVAL("hive.metastore.ds.retry.interval", 1000), - // Whether to force reloading of the metastore configuration (including - // the connection URL, before the next metastore query that accesses the - // datastore. Once reloaded, the this value is reset to false. Used for - // testing only. - METASTOREFORCERELOADCONF("hive.metastore.force.reload.conf", false), METASTORESERVERMINTHREADS("hive.metastore.server.min.threads", 200), METASTORESERVERMAXTHREADS("hive.metastore.server.max.threads", Integer.MAX_VALUE), METASTORE_TCP_KEEP_ALIVE("hive.metastore.server.tcp.keepalive", true),