Browse Source

HADOOP-8132. 64bit secure datanodes do not start as the jsvc path is wrong. Contributed by Arpit Gupta.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.0@1302071 13f79535-47bb-0310-9956-ffa450edef68
Matthew Foley 13 years ago
parent
commit
2d83240ec9
2 changed files with 13 additions and 7 deletions
  1. 3 0
      CHANGES.txt
  2. 10 7
      bin/hadoop

+ 3 - 0
CHANGES.txt

@@ -54,6 +54,9 @@ Release 1.0.2 - unreleased
     HADOOP-8088. User-group mapping cache incorrectly does negative caching on
     transient failures (Kihwal Lee via bobby)
 
+    HADOOP-8132. 64bit secure datanodes do not start as the jsvc path is wrong
+    (Arpit Gupta via mattf)
+
 Release 1.0.1 - 2012.02.14
 
   NEW FEATURES

+ 10 - 7
bin/hadoop

@@ -315,16 +315,19 @@ if $cygwin; then
   HADOOP_LOG_DIR=`cygpath -w "$HADOOP_LOG_DIR"`
   TOOL_PATH=`cygpath -p -w "$TOOL_PATH"`
 fi
+
+#Determine the JAVA_PLATFORM
+JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} -Xmx32m ${HADOOP_JAVA_PLATFORM_OPTS} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
+  
+if [ "$JAVA_PLATFORM" = "Linux-amd64-64" ]; then
+  JSVC_ARCH="amd64"
+else
+  JSVC_ARCH="i386"
+fi
+
 # setup 'java.library.path' for native-hadoop code if necessary
 JAVA_LIBRARY_PATH=''
 if [ -d "${HADOOP_HOME}/build/native" -o -d "${HADOOP_HOME}/lib/native" -o -e "${HADOOP_PREFIX}/lib/libhadoop.a" ]; then
-  JAVA_PLATFORM=`CLASSPATH=${CLASSPATH} ${JAVA} -Xmx32m ${HADOOP_JAVA_PLATFORM_OPTS} org.apache.hadoop.util.PlatformName | sed -e "s/ /_/g"`
-  
-  if [ "$JAVA_PLATFORM" = "Linux-amd64-64" ]; then
-    JSVC_ARCH="amd64"
-  else
-    JSVC_ARCH="i386"
-  fi
 
   if [ -d "$HADOOP_HOME/build/native" ]; then
     JAVA_LIBRARY_PATH=${HADOOP_HOME}/build/native/${JAVA_PLATFORM}/lib