You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2009/10/26 23:33:44 UTC

svn commit: r830008 - in /hadoop/hive/trunk: CHANGES.txt ql/src/java/org/apache/hadoop/hive/ql/Driver.java ql/src/test/results/clientpositive/repair.q.out

Author: zshao
Date: Mon Oct 26 22:33:44 2009
New Revision: 830008

URL: http://svn.apache.org/viewvc?rev=830008&view=rev
Log:
HIVE-880. User group information not populated for pre and post hook. (Namit Jain via zshao)

Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
    hadoop/hive/trunk/ql/src/test/results/clientpositive/repair.q.out

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=830008&r1=830007&r2=830008&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Mon Oct 26 22:33:44 2009
@@ -211,6 +211,9 @@
     HIVE-893. Thrift serde doesn't work with the new version of thrift.
     (Ning Zhang via zshao)
 
+    HIVE-880. User group information not populated for pre and post hook.
+    (Namit Jain via zshao)
+
 Release 0.4.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=830008&r1=830007&r2=830008&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Mon Oct 26 22:33:44 2009
@@ -55,7 +55,7 @@
 import org.apache.hadoop.mapred.ClusterStatus;
 import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.security.UnixUserGroupInformation;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -218,11 +218,21 @@
    */
   public Driver(HiveConf conf) {
     this.conf = conf;
+    try {
+      UnixUserGroupInformation.login(conf, true);
+    } catch (Exception e) {
+      LOG.warn("Ignoring " + e.getMessage());
+    }
   }
 
   public Driver() {
     if (SessionState.get() != null) {
       conf = SessionState.get().getConf();
+      try {
+        UnixUserGroupInformation.login(conf, true);
+      } catch (Exception e) {
+        LOG.warn("Ignoring " + e.getMessage());
+      }
     }
   }
 
@@ -402,7 +412,7 @@
       for(PreExecute peh: getPreExecHooks()) {
         peh.run(SessionState.get(),
                 sem.getInputs(), sem.getOutputs(),
-                UserGroupInformation.getCurrentUGI());
+                UnixUserGroupInformation.readFromConf(conf, UnixUserGroupInformation.UGI_PROPERTY_NAME));
       }
 
       int jobs = countJobs(sem.getRootTasks());
@@ -480,7 +490,7 @@
       for(PostExecute peh: getPostExecHooks()) {
         peh.run(SessionState.get(),
                 sem.getInputs(), sem.getOutputs(),
-                UserGroupInformation.getCurrentUGI());
+                UnixUserGroupInformation.readFromConf(conf, UnixUserGroupInformation.UGI_PROPERTY_NAME));
       }
 
       if (SessionState.get() != null){

Modified: hadoop/hive/trunk/ql/src/test/results/clientpositive/repair.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/clientpositive/repair.q.out?rev=830008&r1=830007&r2=830008&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/clientpositive/repair.q.out (original)
+++ hadoop/hive/trunk/ql/src/test/results/clientpositive/repair.q.out Mon Oct 26 22:33:44 2009
@@ -15,14 +15,14 @@
 PREHOOK: type: MSCK
 POSTHOOK: query: MSCK TABLE repairtable
 POSTHOOK: type: MSCK
-Partitions not in metastore:	repairtable:p1=b/p2=a	repairtable:p1=a/p2=a
+Partitions not in metastore:	repairtable:p1=a/p2=a	repairtable:p1=b/p2=a
 PREHOOK: query: MSCK REPAIR TABLE repairtable
 PREHOOK: type: MSCK
 POSTHOOK: query: MSCK REPAIR TABLE repairtable
 POSTHOOK: type: MSCK
-Partitions not in metastore:	repairtable:p1=b/p2=a	repairtable:p1=a/p2=a
-Repair: Added partition to metastore repairtable:p1=b/p2=a
+Partitions not in metastore:	repairtable:p1=a/p2=a	repairtable:p1=b/p2=a
 Repair: Added partition to metastore repairtable:p1=a/p2=a
+Repair: Added partition to metastore repairtable:p1=b/p2=a
 PREHOOK: query: MSCK TABLE repairtable
 PREHOOK: type: MSCK
 POSTHOOK: query: MSCK TABLE repairtable