hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1077469 - /hadoop/common/branches/branch-0.20-security-patches/bin/hadoop
Date Fri, 04 Mar 2011 04:18:13 GMT
Author: omalley
Date: Fri Mar  4 04:18:13 2011
New Revision: 1077469

URL: http://svn.apache.org/viewvc?rev=1077469&view=rev
Log:
commit 49f2210a57e63c13d4725e171590081794ee0e0c
Author: Jakob Homan <jhoman@yahoo-inc.com>
Date:   Mon May 17 17:49:02 2010 -0700

    HDFS-1150 (bugfix) from
    https://issues.apache.org/jira/secure/attachment/12444750/HDFS-1150-BF1-Y20.patch

Modified:
    hadoop/common/branches/branch-0.20-security-patches/bin/hadoop

Modified: hadoop/common/branches/branch-0.20-security-patches/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/bin/hadoop?rev=1077469&r1=1077468&r2=1077469&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20-security-patches/bin/hadoop Fri Mar  4 04:18:13 2011
@@ -306,7 +306,24 @@ HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.polic
 # Check to see if we should start a secure datanode
 if [ "$COMMAND" = "datanode" ]; then
   if [[ $EUID -eq 0 ]]; then
-    exec "jsvc" -outfile /dev/stdout -errfile /dev/stderr -cp "$CLASSPATH" -nodetach -user
hdfs -cp "$CLASSPATH" $JAVA_HEAP_MAX $HADOOP_OPTS org.apache.hadoop.hdfs.server.datanode.SecureDataNodeStarter
"$@"
+    if [ "$HADOOP_SECURE_DN_USER" = "" ]; then
+      HADOOP_SECURE_DN_PID="hdfs"
+    fi
+
+    if [ "$HADOOP_PID_DIR" = "" ]; then
+      HADOOP_SECURE_DN_PID="/tmp/hadoop_secure_dn.pid"
+    else
+      HADOOP_SECURE_DN_PID="$HADOOP_PID_DIR/hadoop_secure_dn.pid"
+    fi
+
+    exec "jsvc" -outfile "$HADOOP_LOG_DIR/jsvc.out" \
+                -errfile "$HADOOP_LOG_DIR/jsvc.err" \
+                -pidfile "$HADOOP_SECURE_DN_PID" \
+                -nodetach \
+                -user "$HADOOP_SECURE_DN_USER" \
+                -cp "$CLASSPATH" \
+                $JAVA_HEAP_MAX $HADOOP_OPTS \
+                org.apache.hadoop.hdfs.server.datanode.SecureDataNodeStarter "$@"
   fi
 else
   # run it



Mime
View raw message