svn commit: r764548 - in /hadoop/hive/trunk: common/src/java/org/apache/hadoop/hive/conf/HiveConf.java metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java

[pr...@apache.org]

Author: prasadc
Date: Mon Apr 13 18:10:39 2009
New Revision: 764548

URL: http://svn.apache.org/viewvc?rev=764548&view=rev
Log:
HIVE-403:remove password password params from job config that is submitted to job tracker

Modified:
    hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java

Modified: hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=764548&r1=764547&r2=764548&view=diff
==============================================================================
--- hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Mon Apr 13 18:10:39 2009
@@ -79,6 +79,7 @@
     METASTOREDIRECTORY("hive.metastore.metadb.dir", ""),
     METASTOREWAREHOUSE("hive.metastore.warehouse.dir", ""),
     METASTOREURIS("hive.metastore.uris", ""),
+    METASTOREPWD("javax.jdo.option.ConnectionPassword", ""),
 
     // Things we log in the jobconf
 

Modified: hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java?rev=764548&r1=764547&r2=764548&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (original)
+++ hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java Mon Apr 13 18:10:39 2009
@@ -41,6 +41,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.api.Database;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.InvalidObjectException;
@@ -158,7 +159,7 @@
       Map.Entry<String, String> e = iter.next();
       if(e.getKey().contains("jpox") || e.getKey().contains("jdo")) {
         Object prevVal = prop.setProperty(e.getKey(), e.getValue());
-        if(LOG.isDebugEnabled()) {
+        if(LOG.isDebugEnabled() && !e.getKey().equals(HiveConf.ConfVars.METASTOREPWD.varname)) {
           LOG.debug("Overriding " + e.getKey() + " value " + prevVal 
               + " from  jpox.properties with " + e.getValue());
         }
@@ -167,7 +168,8 @@
 
     if(LOG.isDebugEnabled()) {
       for (Entry<Object, Object> e: prop.entrySet()) {
-        LOG.debug(e.getKey() + " = " + e.getValue());
+        if(!e.getKey().equals(HiveConf.ConfVars.METASTOREPWD.varname))
+          LOG.debug(e.getKey() + " = " + e.getValue());
       }
     }
   }

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java?rev=764548&r1=764547&r2=764548&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecDriver.java Mon Apr 13 18:10:39 2009
@@ -385,12 +385,17 @@
         return 0;
       }
 
+      // remove the pwd from conf file so that job tracker doesn't show this logs
+      String pwd = job.get(HiveConf.ConfVars.METASTOREPWD.varname);
+      job.set(HiveConf.ConfVars.METASTOREPWD.varname, "HIVE");
       JobClient jc = new JobClient(job);
 
       // make this client wait if job trcker is not behaving well.
       Throttle.checkJobTracker(job, LOG);
 
       orig_rj = rj = jc.submitJob(job);
+      // replace it back
+      job.set(HiveConf.ConfVars.METASTOREPWD.varname, pwd);
 
       // add to list of running jobs so in case of abnormal shutdown can kill
       // it.