svn commit: r1346256 - in /hadoop/common/branches/branch-0.22/mapreduce: CHANGES.txt src/c++/task-controller/test/test-task-controller.c

[shv]

Author: shv
Date: Tue Jun  5 06:38:43 2012
New Revision: 1346256

URL: http://svn.apache.org/viewvc?rev=1346256&view=rev
Log:
MAPREDUCE-2376. test-task-controller fails if run as a userid < 1000. 
Contributed by Todd Lipcon and Benoy Antony.

Modified:
    hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
    
hadoop/common/branches/branch-0.22/mapreduce/src/c++/task-controller/test/test-task-controller.c

Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1346256&r1=1346255&r2=1346256&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Tue Jun  5 
06:38:43 2012
@@ -59,6 +59,9 @@ Release 0.22.1 - Unreleased
     MAPREDUCE-2103. Additional changes to task-controller.c
     (Benoy Antony via shv)
 
+    MAPREDUCE-2376. test-task-controller fails if run as a userid < 1000.
+    (Todd Lipcon and Benoy Antony via shv)
+
 Release 0.22.0 - 2011-11-29
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.22/mapreduce/src/c++/task-controller/test/test-task-controller.c
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/src/c%2B%2B/task-controller/test/test-task-controller.c?rev=1346256&r1=1346255&r2=1346256&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.22/mapreduce/src/c++/task-controller/test/test-task-controller.c
 (original)
+++ 
hadoop/common/branches/branch-0.22/mapreduce/src/c++/task-controller/test/test-task-controller.c
 Tue Jun  5 06:38:43 2012
@@ -694,7 +694,7 @@ int main(int argc, char **argv) {
 
   if (getuid() == 0 && argc == 2) {
     username = argv[1];
-  } else {
+  } else if ((username = getenv("TC_TEST_USERNAME")) == NULL) {
     username = strdup(getpwuid(getuid())->pw_name);
     my_username = 1;
   }