Просмотр исходного кода

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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-patches@1077469 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley 14 лет назад
Родитель
Сommit
9efc707caa
1 измененных файлов с 18 добавлено и 1 удалено
  1. 18 1
      bin/hadoop

+ 18 - 1
bin/hadoop

@@ -306,7 +306,24 @@ HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.policy.file=$HADOOP_POLICYFILE"
 # 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