You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2012/03/18 07:57:01 UTC
svn commit: r1302072 - in /hadoop/common/branches/branch-1: CHANGES.txt
bin/hadoop
Author: mattf
Date: Sun Mar 18 06:57:01 2012
New Revision: 1302072
URL: http://svn.apache.org/viewvc?rev=1302072&view=rev
Log:
HADOOP-8132. 64bit secure datanodes do not start as the jsvc path is wrong. Contributed by Arpit Gupta.
Modified:
hadoop/common/branches/branch-1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1/bin/hadoop
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1302072&r1=1302071&r2=1302072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Mar 18 06:57:01 2012
@@ -215,6 +215,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
Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.0/CHANGES.txt:r1302071
Modified: hadoop/common/branches/branch-1/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/bin/hadoop?rev=1302072&r1=1302071&r2=1302072&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/bin/hadoop (original)
+++ hadoop/common/branches/branch-1/bin/hadoop Sun Mar 18 06:57:01 2012
@@ -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