Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/JNIFlags.cmake URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/JNIFlags.cmake?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/JNIFlags.cmake (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/JNIFlags.cmake Tue Oct 16 00:02:55 2012 @@ -65,4 +65,53 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm endif (READELF MATCHES "NOTFOUND") endif (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND CMAKE_SYSTEM_NAME STREQUAL "Linux") -find_package(JNI REQUIRED) +IF("${CMAKE_SYSTEM}" MATCHES "Linux") + # + # Locate JNI_INCLUDE_DIRS and JNI_LIBRARIES. + # Since we were invoked from Maven, we know that the JAVA_HOME environment + # variable is valid. So we ignore system paths here and just use JAVA_HOME. + # + FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME) + IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") + SET(_java_libarch "i386") + ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") + SET(_java_libarch "amd64") + ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + SET(_java_libarch "arm") + ELSE() + SET(_java_libarch ${CMAKE_SYSTEM_PROCESSOR}) + ENDIF() + SET(_JDK_DIRS "${_JAVA_HOME}/jre/lib/${_java_libarch}/*" + "${_JAVA_HOME}/jre/lib/${_java_libarch}" + "${_JAVA_HOME}/jre/lib/*" + "${_JAVA_HOME}/jre/lib" + "${_JAVA_HOME}/lib/*" + "${_JAVA_HOME}/lib" + "${_JAVA_HOME}/include/*" + "${_JAVA_HOME}/include" + "${_JAVA_HOME}" + ) + FIND_PATH(JAVA_INCLUDE_PATH + NAMES jni.h + PATHS ${_JDK_DIRS} + NO_DEFAULT_PATH) + FIND_PATH(JAVA_INCLUDE_PATH2 + NAMES jni_md.h + PATHS ${_JDK_DIRS} + NO_DEFAULT_PATH) + SET(JNI_INCLUDE_DIRS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) + FIND_LIBRARY(JAVA_JVM_LIBRARY + NAMES jvm JavaVM + PATHS ${_JDK_DIRS} + NO_DEFAULT_PATH) + SET(JNI_LIBRARIES ${JAVA_JVM_LIBRARY}) + MESSAGE("JAVA_HOME=${JAVA_HOME}, JAVA_JVM_LIBRARY=${JAVA_JVM_LIBRARY}") + MESSAGE("JAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH}, JAVA_INCLUDE_PATH2=${JAVA_INCLUDE_PATH2}") + IF(JAVA_JVM_LIBRARY AND JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2) + MESSAGE("Located all JNI components successfully.") + ELSE() + MESSAGE(FATAL_ERROR "Failed to find a viable JVM installation under JAVA_HOME.") + ENDIF() +ELSE() + find_package(JNI REQUIRED) +ENDIF()
Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/config.h.cmake URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/config.h.cmake?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/config.h.cmake (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/config.h.cmake Tue Oct 16 00:02:55 2012 @@ -2,7 +2,6 @@ #define CONFIG_H #cmakedefine HADOOP_ZLIB_LIBRARY "@HADOOP_ZLIB_LIBRARY@" -#cmakedefine HADOOP_RUNAS_HOME "@HADOOP_RUNAS_HOME@" #cmakedefine HADOOP_SNAPPY_LIBRARY "@HADOOP_SNAPPY_LIBRARY@" #cmakedefine HAVE_SYNC_FILE_RANGE #cmakedefine HAVE_POSIX_FADVISE Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/contrib/bash-tab-completion/hadoop.sh Tue Oct 16 00:02:55 2012 @@ -26,7 +26,7 @@ _hadoop() { COMPREPLY=() cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - script=${COMP_WORDS[0]} + script=`which ${COMP_WORDS[0]}` # Bash lets you tab complete things even if the script doesn't # exist (or isn't executable). Check to make sure it is, as we Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop Tue Oct 16 00:02:55 2012 @@ -19,7 +19,7 @@ bin=`which $0` bin=`dirname ${bin}` -bin=`cd "$bin"; pwd` +bin=`cd "$bin" > /dev/null; pwd` DEFAULT_LIBEXEC_DIR="$bin"/../libexec HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR} Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Tue Oct 16 00:02:55 2012 @@ -74,6 +74,10 @@ fi export HADOOP_CONF_DIR="${HADOOP_CONF_DIR:-$HADOOP_PREFIX/$DEFAULT_CONF_DIR}" +if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then + . "${HADOOP_CONF_DIR}/hadoop-env.sh" +fi + # User can specify hostnames or a file where the hostnames are (not both) if [[ ( "$HADOOP_SLAVES" != '' ) && ( "$HADOOP_SLAVE_NAMES" != '' ) ]] ; then echo \ @@ -113,9 +117,6 @@ case "`uname`" in CYGWIN*) cygwin=true;; esac -if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then - . "${HADOOP_CONF_DIR}/hadoop-env.sh" -fi # check if net.ipv6.bindv6only is set to 1 bindv6only=$(/sbin/sysctl -n net.ipv6.bindv6only 2> /dev/null) @@ -243,6 +244,7 @@ HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.id.st HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.root.logger=${HADOOP_ROOT_LOGGER:-INFO,console}" if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then HADOOP_OPTS="$HADOOP_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH" + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$JAVA_LIBRARY_PATH fi HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.policy.file=$HADOOP_POLICYFILE" @@ -267,21 +269,21 @@ fi CLASSPATH=${CLASSPATH}:$HADOOP_HDFS_HOME/$HDFS_DIR'/*' # put yarn in classpath if present -if [ "$YARN_HOME" = "" ]; then +if [ "$HADOOP_YARN_HOME" = "" ]; then if [ -d "${HADOOP_PREFIX}/$YARN_DIR" ]; then - export YARN_HOME=$HADOOP_PREFIX + export HADOOP_YARN_HOME=$HADOOP_PREFIX fi fi -if [ -d "$YARN_HOME/$YARN_DIR/webapps" ]; then - CLASSPATH=${CLASSPATH}:$YARN_HOME/$YARN_DIR +if [ -d "$HADOOP_YARN_HOME/$YARN_DIR/webapps" ]; then + CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/$YARN_DIR fi -if [ -d "$YARN_HOME/$YARN_LIB_JARS_DIR" ]; then - CLASSPATH=${CLASSPATH}:$YARN_HOME/$YARN_LIB_JARS_DIR'/*' +if [ -d "$HADOOP_YARN_HOME/$YARN_LIB_JARS_DIR" ]; then + CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/$YARN_LIB_JARS_DIR'/*' fi -CLASSPATH=${CLASSPATH}:$YARN_HOME/$YARN_DIR'/*' +CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/$YARN_DIR'/*' # put mapred in classpath if present AND different from YARN if [ "$HADOOP_MAPRED_HOME" = "" ]; then @@ -290,7 +292,7 @@ if [ "$HADOOP_MAPRED_HOME" = "" ]; then fi fi -if [ "$HADOOP_MAPRED_HOME/$MAPRED_DIR" != "$YARN_HOME/$YARN_DIR" ] ; then +if [ "$HADOOP_MAPRED_HOME/$MAPRED_DIR" != "$HADOOP_YARN_HOME/$YARN_DIR" ] ; then if [ -d "$HADOOP_MAPRED_HOME/$MAPRED_DIR/webapps" ]; then CLASSPATH=${CLASSPATH}:$HADOOP_MAPRED_HOME/$MAPRED_DIR fi Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh Tue Oct 16 00:02:55 2012 @@ -141,7 +141,7 @@ case $startStop in echo starting $command, logging to $log cd "$HADOOP_PREFIX" case $command in - namenode|secondarynamenode|datanode|dfs|dfsadmin|fsck|balancer|zkfc) + namenode|secondarynamenode|datanode|journalnode|dfs|dfsadmin|fsck|balancer|zkfc) if [ -z "$HADOOP_HDFS_HOME" ]; then hdfsScript="$HADOOP_PREFIX"/bin/hdfs else Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/slaves.sh Tue Oct 16 00:02:55 2012 @@ -42,9 +42,6 @@ DEFAULT_LIBEXEC_DIR="$bin"/../libexec HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR} . $HADOOP_LIBEXEC_DIR/hadoop-config.sh -if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then - . "${HADOOP_CONF_DIR}/hadoop-env.sh" -fi # Where to start the script, see hadoop-config.sh # (it set up the variables based on command line options) Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh Tue Oct 16 00:02:55 2012 @@ -33,6 +33,6 @@ if [ -f "${HADOOP_HDFS_HOME}"/sbin/start fi # start yarn daemons if yarn is present -if [ -f "${YARN_HOME}"/sbin/start-yarn.sh ]; then - "${YARN_HOME}"/sbin/start-yarn.sh --config $HADOOP_CONF_DIR +if [ -f "${HADOOP_YARN_HOME}"/sbin/start-yarn.sh ]; then + "${HADOOP_YARN_HOME}"/sbin/start-yarn.sh --config $HADOOP_CONF_DIR fi Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh Tue Oct 16 00:02:55 2012 @@ -47,6 +47,14 @@ done # Extra Java runtime options. Empty by default. export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_CLIENT_OPTS" +MAC_OSX=false +case "`uname`" in +Darwin*) MAC_OSX=true;; +esac +if $MAC_OSX; then + export HADOOP_OPTS="$HADOOP_OPTS -Djava.security.krb5.realm= -Djava.security.krb5.kdc=" +fi + # Command specific options appended to HADOOP_OPTS when specified export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=${HADOOP_SECURITY_LOGGER:-INFO,RFAS} -Dhdfs.audit.logger=${HDFS_AUDIT_LOGGER:-INFO,NullAppender} $HADOOP_NAMENODE_OPTS" export HADOOP_DATANODE_OPTS="-Dhadoop.security.logger=ERROR,RFAS $HADOOP_DATANODE_OPTS" Modified: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties URL: http://svn.apache.org/viewvc/hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties?rev=1398581&r1=1398580&r2=1398581&view=diff ============================================================================== --- hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties (original) +++ hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties Tue Oct 16 00:02:55 2012 @@ -2,7 +2,7 @@ # See javadoc of package-info.java for org.apache.hadoop.metrics2 for details *.sink.file.class=org.apache.hadoop.metrics2.sink.FileSink -# default sampling period +# default sampling period, in seconds *.period=10 # The namenode-metrics.out will contain metrics from all context Propchange: hadoop/common/branches/MR-3902/hadoop-common-project/hadoop-common/src/main/docs/ ------------------------------------------------------------------------------ Merged /hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/docs:r1363593-1396941
