Author: shv
Date: Wed Dec 28 21:08:37 2011
New Revision: 1225337
URL: http://svn.apache.org/viewvc?rev=1225337&view=rev
Log:
HDFS-1910. NameNdoe should not save fsimage twice. Contributed by Konstantin
Shvachko.
Added:
hadoop/common/branches/branch-0.22/hdfs/bin/hadoop (with props)
Modified:
hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Modified: hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1225337&r1=1225336&r2=1225337&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Wed Dec 28 21:08:37 2011
@@ -12,6 +12,8 @@ Release 0.22.1 - Unreleased
BUG FIXES
+ HDFS-1910. NameNode should not save fsimage twice. (shv)
+
Release 0.22.0 - 2011-11-29
INCOMPATIBLE CHANGES
Added: hadoop/common/branches/branch-0.22/hdfs/bin/hadoop
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/bin/hadoop?rev=1225337&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/bin/hadoop (added)
+++ hadoop/common/branches/branch-0.22/hdfs/bin/hadoop Wed Dec 28 21:08:37 2011
@@ -0,0 +1,127 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script runs the hadoop core commands.
+
+bin=`dirname "$0"`
+bin=`cd "$bin"; pwd`
+
+. "$bin"/hadoop-config.sh
+
+function print_usage(){
+ echo "Usage: hadoop [--config confdir] COMMAND"
+ echo " where COMMAND is one of:"
+ echo " fs run a generic filesystem user client"
+ echo " version print the version"
+ echo " jar <jar> run a jar file"
+ echo " distcp <srcurl> <desturl> copy file or directories recursively"
+ echo " archive -archiveName NAME -p <parent path> <src>* <dest> create a
hadoop archive"
+ echo " classpath prints the class path needed to get the"
+ echo " Hadoop jar and the required libraries"
+ echo " daemonlog get/set the log level for each daemon"
+ echo " or"
+ echo " CLASSNAME run the class named CLASSNAME"
+ echo ""
+ echo "Most commands print help when invoked w/o parameters."
+}
+
+if [ $# = 0 ]; then
+ print_usage
+ exit
+fi
+
+COMMAND=$1
+case $COMMAND in
+ #hdfs commands
+ namenode|secondarynamenode|datanode|dfs|dfsadmin|fsck|balancer)
+ echo "DEPRECATED: Use of this script to execute hdfs command is
deprecated."
+ echo "Instead use the hdfs command for it."
+ echo ""
+ #try to locate hdfs and if present, delegate to it.
+ if [ -f "${HADOOP_HDFS_HOME}"/bin/hdfs ]; then
+ exec "${HADOOP_HDFS_HOME}"/bin/hdfs $*
+ elif [ -f "${HADOOP_HOME}"/bin/hdfs ]; then
+ exec "${HADOOP_HOME}"/bin/hdfs $*
+ else
+ echo "HDFS not found."
+ exit
+ fi
+ ;;
+
+ #mapred commands
+ mradmin|jobtracker|tasktracker|pipes|job|queue)
+ echo "DEPRECATED: Use of this script to execute mapred command is
deprecated."
+ echo "Instead use the mapred command for it."
+ echo ""
+ #try to locate mapred and if present, delegate to it.
+ if [ -f "${HADOOP_MAPRED_HOME}"/bin/mapred ]; then
+ exec "${HADOOP_MAPRED_HOME}"/bin/mapred $*
+ elif [ -f "${HADOOP_HOME}"/bin/mapred ]; then
+ exec "${HADOOP_HOME}"/bin/mapred $*
+ else
+ echo "MAPRED not found."
+ exit
+ fi
+ ;;
+
+ classpath)
+ if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ fi
+ echo $CLASSPATH
+ exit
+ ;;
+
+ #core commands
+ *)
+ # the core commands
+ if [ "$COMMAND" = "fs" ] ; then
+ CLASS=org.apache.hadoop.fs.FsShell
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
+ elif [ "$COMMAND" = "version" ] ; then
+ CLASS=org.apache.hadoop.util.VersionInfo
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
+ elif [ "$COMMAND" = "jar" ] ; then
+ CLASS=org.apache.hadoop.util.RunJar
+ elif [ "$COMMAND" = "distcp" ] ; then
+ CLASS=org.apache.hadoop.tools.DistCp
+ CLASSPATH=${CLASSPATH}:${TOOL_PATH}
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
+ elif [ "$COMMAND" = "daemonlog" ] ; then
+ CLASS=org.apache.hadoop.log.LogLevel
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
+ elif [ "$COMMAND" = "archive" ] ; then
+ CLASS=org.apache.hadoop.tools.HadoopArchives
+ CLASSPATH=${CLASSPATH}:${TOOL_PATH}
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
+ elif [[ "$COMMAND" = -* ]] ; then
+ # class and package names cannot begin with a -
+ echo "Error: No command named \`$COMMAND' was found. Perhaps you meant
\`hadoop ${COMMAND#-}'"
+ exit 1
+ else
+ CLASS=$COMMAND
+ fi
+ shift
+
+ if $cygwin; then
+ CLASSPATH=`cygpath -p -w "$CLASSPATH"`
+ fi
+ export CLASSPATH=$CLASSPATH
+ exec "$JAVA" $JAVA_HEAP_MAX $HADOOP_OPTS $CLASS "$@"
+ ;;
+
+esac
Propchange: hadoop/common/branches/branch-0.22/hdfs/bin/hadoop
------------------------------------------------------------------------------
svn:executable = *
Modified:
hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java?rev=1225337&r1=1225336&r2=1225337&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
(original)
+++
hadoop/common/branches/branch-0.22/hdfs/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
Wed Dec 28 21:08:37 2011
@@ -1257,6 +1257,8 @@ public class FSImage extends Storage {
if (errorSDs.contains(sd)) {
continue;
}
+ if (sd.getStorageDirType().isOfType(NameNodeDirType.IMAGE_AND_EDITS))
+ continue; // this has already been saved as IMAGE directory
try {
FSImageSaver saver = new FSImageSaver(sd, errorSDs);
Thread saveThread = new Thread(saver, saver.toString());
