You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2013/12/27 07:06:33 UTC
svn commit: r1553628 - in /hive/branches/tez: ./
hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java
metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
Author: gunther
Date: Fri Dec 27 06:06:32 2013
New Revision: 1553628
URL: http://svn.apache.org/r1553628
Log:
Merge latest trunk into branch. (Gunther Hagleitner)
Modified:
hive/branches/tez/ (props changed)
hive/branches/tez/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java
hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
Propchange: hive/branches/tez/
------------------------------------------------------------------------------
Merged /hive/trunk:r1553448-1553627
Modified: hive/branches/tez/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java?rev=1553628&r1=1553627&r2=1553628&view=diff
==============================================================================
--- hive/branches/tez/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java (original)
+++ hive/branches/tez/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/AppConfig.java Fri Dec 27 06:06:32 2013
@@ -19,7 +19,13 @@
package org.apache.hive.hcatalog.templeton;
import java.io.File;
+import java.io.StringBufferInputStream;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
@@ -141,16 +147,52 @@ public class AppConfig extends Configura
set("env." + e.getKey(), e.getValue());
String templetonDir = getTempletonDir();
- for (String fname : TEMPLETON_CONF_FILENAMES)
+ for (String fname : TEMPLETON_CONF_FILENAMES) {
+ logConfigLoadAttempt(templetonDir + File.separator + fname);
if (! loadOneClasspathConfig(fname))
loadOneFileConfig(templetonDir, fname);
-
+ }
String hadoopConfDir = getHadoopConfDir();
- for (String fname : HADOOP_CONF_FILENAMES)
+ for (String fname : HADOOP_CONF_FILENAMES) {
+ logConfigLoadAttempt(hadoopConfDir + File.separator + fname);
loadOneFileConfig(hadoopConfDir, fname);
+ }
ProxyUserSupport.processProxyuserConfig(this);
+ LOG.info(dumpEnvironent());
+ }
+ private static void logConfigLoadAttempt(String path) {
+ LOG.info("Attempting to load config file: " + path);
}
+ /**
+ * Dumps all env and config state. Should be called once on WebHCat start up to facilitate
+ * support/debugging. Later it may be worth adding a REST call which will return this data.
+ */
+ private String dumpEnvironent() {
+ StringBuilder sb = new StringBuilder("WebHCat environment:\n");
+ Map<String, String> env = System.getenv();
+ List<String> propKeys = new ArrayList<String>(env.keySet());
+ Collections.sort(propKeys);
+ for(String propKey : propKeys) {
+ sb.append(propKey).append('=').append(env.get(propKey)).append('\n');
+ }
+ sb.append("Configration properties: \n");
+ Iterator<Map.Entry<String, String>> configIter = this.iterator();
+ List<Map.Entry<String, String>> configVals = new ArrayList<Map.Entry<String, String>>();
+ while(configIter.hasNext()) {
+ configVals.add(configIter.next());
+ }
+ Collections.sort(configVals, new Comparator<Map.Entry<String, String>> () {
+ @Override
+ public int compare(Map.Entry<String, String> ent, Map.Entry<String, String> ent2) {
+ return ent.getKey().compareTo(ent2.getKey());
+ }
+ });
+ for(Map.Entry<String, String> entry : configVals) {
+ sb.append(entry.getKey()).append('=').append(entry.getValue()).append('\n');
+ }
+ return sb.toString();
+ }
public void startCleanup() {
JobState.getStorageInstance(this).startCleanup(this);
}
@@ -182,7 +224,7 @@ public class AppConfig extends Configura
URL x = getResource(fname);
if (x != null) {
addResource(x);
- LOG.debug("loaded config from classpath " + x);
+ LOG.info("loaded config from classpath " + x);
return true;
}
Modified: hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
URL: http://svn.apache.org/viewvc/hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java?rev=1553628&r1=1553627&r2=1553628&view=diff
==============================================================================
--- hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (original)
+++ hive/branches/tez/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java Fri Dec 27 06:06:32 2013
@@ -322,7 +322,7 @@ public class HiveMetaStoreClient impleme
}
}
// Wait before launching the next round of connection retries.
- if (retryDelaySeconds > 0) {
+ if (!isConnected && retryDelaySeconds > 0) {
try {
LOG.info("Waiting " + retryDelaySeconds + " seconds before next connection attempt.");
Thread.sleep(retryDelaySeconds * 1000);