Преглед изворни кода

HDFS-4541. Set hadoop.log.dir and hadoop.id.str when starting secure datanode to write the logs to right dir by default. Contributed by Arpit Gupta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1452461 13f79535-47bb-0310-9956-ffa450edef68
Suresh Srinivas пре 12 година
родитељ
комит
3ea26d3408

+ 4 - 0
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -339,6 +339,10 @@ Release 2.0.4-beta - UNRELEASED
     HDFS-4235. When outputting XML, OfflineEditsViewer can't handle some edits
     HDFS-4235. When outputting XML, OfflineEditsViewer can't handle some edits
     containing non-ASCII strings. (Colin Patrick McCabe via atm)
     containing non-ASCII strings. (Colin Patrick McCabe via atm)
 
 
+    HDFS-4541. Set hadoop.log.dir and hadoop.id.str when starting secure
+    datanode to write the logs to right dir by default. (Arpit Gupta via
+    suresh)
+
 Release 2.0.3-alpha - 2013-02-06
 Release 2.0.3-alpha - 2013-02-06
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 2 - 0
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs

@@ -73,9 +73,11 @@ if [ "$COMMAND" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_
   
   
     if [ -n "$HADOOP_SECURE_DN_LOG_DIR" ]; then
     if [ -n "$HADOOP_SECURE_DN_LOG_DIR" ]; then
       HADOOP_LOG_DIR=$HADOOP_SECURE_DN_LOG_DIR
       HADOOP_LOG_DIR=$HADOOP_SECURE_DN_LOG_DIR
+      HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.dir=$HADOOP_LOG_DIR"
     fi
     fi
    
    
     HADOOP_IDENT_STRING=$HADOOP_SECURE_DN_USER
     HADOOP_IDENT_STRING=$HADOOP_SECURE_DN_USER
+    HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.id.str=$HADOOP_IDENT_STRING"
     starting_secure_dn="true"
     starting_secure_dn="true"
   else
   else
     echo "It looks like you're trying to start a secure DN, but \$JSVC_HOME"\
     echo "It looks like you're trying to start a secure DN, but \$JSVC_HOME"\